Merge branch 'dev' into map

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

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

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

diff --cc src/map/mapengine.h
index f4d60df,30d9fc1..60b648e
--- 1/src/map/mapengine.h
--- 2/src/map/mapengine.h
+++ b/src/map/mapengine.h
@@@ -265,10 -265,10 +266,11 @@@ private
      MapScene *m_mapScene; ///< Scene for map tiles
      MapZoomPanel *m_mapZoomPanel; ///< Toolbar for zoom buttons
      QPoint m_centerTile; ///< Current center tile
+     OwnLocationItem *m_ownLocation; ///< Item to show own location
      QPoint m_sceneCoordinate; ///< Current center coordinate
 -    QRect m_viewGrid; ///< Current grid of tiles in view (includes margin)
 +    QRect m_viewTilesGrid; ///< Current grid of tiles in view (includes margin)
      QSize m_viewSize; ///< Current view size
 +    bool m_zoomedIn; ///< Flag for checking if zoomed in when zoom is finished
      int m_zoomLevel; ///< Current zoom level
  };
  

diff --cc src/src.pro
Simple merge

diff --cc src/ui/mainwindow.cpp
index 74569fd,4e9f291..691557c
--- 1/src/ui/mainwindow.cpp
--- 2/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@@ -32,8 -32,7 +32,6 @@@ MainWindow::MainWindow(QWidget *parent
      : QMainWindow(parent)
  {
      qDebug() << __PRETTY_FUNCTION__;
-     
-     m_loggedIn = false;
 -
      createViews();
      setCentralWidget(m_situareViews);
      createMenus();