Merge branch 'master' into map_double_click_zoom

Conflicts:
	src/map/mapview.cpp
	src/src.pro

diff --cc src/map/mapview.cpp
Simple merge

diff --cc src/map/mapview.h
Simple merge

diff --cc src/ui/mainwindow.cpp
Simple merge