Merge branch 'current_position_marker'

Conflicts:
	images.qrc

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

diff --cc src/map/mapengine.h
index 66f3f04,81f55ca..d5e5535
--- 1/src/map/mapengine.h
--- 2/src/map/mapengine.h
+++ b/src/map/mapengine.h
@@@ -279,19 -293,9 +293,19 @@@ signals
      /**
      * @brief Signal to notify map scrolling.
      */
-     void mapScrolled();
+     void mapScrolledManually();
  
      /**
 +    * @brief Signal to notify when map is zoomed in to the maxmimum.
 +    */
 +    void maxZoomLevelReached();
 +
 +    /**
 +    * @brief Signal to notify when map is zoomed out to the minimum.
 +    */
 +    void minZoomLevelReached();
 +
 +    /**
      * @brief Signal for zoom level change
      *
      * @param newZoomLevel New zoom level
@@@ -302,9 -306,10 +316,10 @@@
   * DATA MEMBERS
   ******************************************************************************/
  private:
 -    bool m_autoCenteringEnabled;    ///< Auto centering enabled
 +    bool m_autoCenteringEnabled; ///< Auto centering enabled
      QPoint m_centerTile; ///< Current center tile
      FriendItemsHandler *m_friendItemsHandler; ///< Handler for friend and group items
+     GPSLocationItem *m_gpsLocationItem; ///< Item pointing current location from GPS
      QPoint m_lastManualPosition;  ///< Last manually set position in scene coordinate
      MapFetcher *m_mapFetcher; ///< Fetcher for map tiles
      MapScene *m_mapScene; ///< Scene for map tiles

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

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

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