Merge branch 'master' into network_handler

diff --cc src/src.pro
index 089132a,695b33b..e18317f
--- 1/src/src.pro
--- 2/src/src.pro
+++ b/src/src.pro
@@@ -41,10 -40,8 +40,9 @@@ SOURCES += main.cpp 
      gps/gpsposition.cpp \
      map/gpslocationitem.cpp \
      ui/zoombuttonpanel.cpp \
 -    ui/userinfo.cpp
 +    ui/userinfo.cpp \
 +    engine/networkhandler.cpp
  HEADERS += ui/mainwindow.h \
-     ui/mapviewscreen.h \
      map/mapengine.h \
      map/mapview.h \
      map/mapscene.h \