Merge branch 'master' into engine

Conflicts:
	src/src.pro

diff --cc src/src.pro
index ee0db9d,5ae8c1b..a97d212
--- 1/src/src.pro
--- 2/src/src.pro
+++ b/src/src.pro
@@@ -21,7 -23,7 +23,8 @@@ SOURCES += main.cpp 
      ui/infotab.cpp \
      ui/updatelocation/updatelocationdialog.cpp \
      ui/updatelocation/texteditautoresizer.cpp \
-     engine/engine.cpp
++    engine/engine.cpp \
+     user/user.cpp
  HEADERS += ui/mainwindow.h \
      ui/mapviewscreen.h \
      ui/listviewscreen.h \
@@@ -41,7 -43,7 +44,8 @@@
      facebookservice/facebookcredentials.h \
      facebookservice/facebookauthentication.h \
      facebookservice/facebookcommon.h \
-     engine/engine.h
++    engine/engine.h \
+     user/user.h
  QT += network \
      webkit