Merge branch 'master' into zoom_button_drag

Conflicts:
	src/common.h
	tests/ui/zoombuttonpanel/zoombuttonpanel.pro

diff --cc src/common.h
index 9c295f1,5390f72..1a5dd1f
--- 1/src/common.h
--- 2/src/common.h
+++ b/src/common.h
@@@ -34,4 -34,6 +34,5 @@@ const QColor COLOR_GRAY = QColor(152, 1
  const QFont NOKIA_FONT_NORMAL = QFont("Nokia Sans", 18, QFont::Normal);    ///< Normal font
  const QFont NOKIA_FONT_SMALL = QFont("Nokia Sans", 13, QFont::Normal);     ///< Small font
  
+ const int DEFAULT_ZOOM_LEVEL_WHEN_GPS_IS_AVAILABLE = 12; ///< Default zoom level when GPS available
 -const QString ZOOMPANEL_POSITION = "ZoomPanelPosition"; ///< Zoom panel position string
  #endif // COMMON_H

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