Merge branch 'master' of https://vcs.maemo.org/git/situare

Conflicts:
	src/src.pro
	src/ui/mapviewscreen.cpp
	src/ui/mapviewscreen.h

diff --cc src/src.pro
index 5183ea6,06b4362..eb321ae
--- 1/src/src.pro
--- 2/src/src.pro
+++ b/src/src.pro
@@@ -41,7 -38,8 +38,9 @@@ SOURCES += main.cpp 
      ui/panelsliderbar.cpp \
      map/friendgroupitem.cpp \
      map/frienditemshandler.cpp \
+     gps/gpspositioninterface.cpp \
 -    ui/zoombuttonpanel.cpp
++    ui/zoombuttonpanel.cpp \
 +    ui/userinfo.cpp
  HEADERS += ui/mainwindow.h \
      ui/mapviewscreen.h \
      map/mapengine.h \
@@@ -80,11 -75,16 +76,17 @@@
      ui/panelsliderbar.h \
      map/friendgroupitem.h \
      map/frienditemshandler.h \
+     gps/gpspositioninterface.h \
+     ui/zoombuttonpanel.h \
 -    situarecommon.h
++    situarecommon.h \
 +    ui/userinfo.h
  QT += network \
      webkit
- #DEFINES += QT_NO_DEBUG_OUTPUT
- !maemo5 { 
+ DEFINES += QT_NO_DEBUG_OUTPUT
+ 
+ !maemo5 {
+     SOURCES += gps/gpspositionmockup.cpp
+     HEADERS += gps/gpspositionmockup.h
      message(QJson built in)
      message(Make sure you have QJson development headers installed)
      message(install headers with: sudo apt-get install libqjson-dev)