Merge branch 'wallika-own'

Conflicts:
	src/ui/mapviewscreen.cpp

diff --cc src/src.pro
index 5d84c02,25445a3..692831f
--- 1/src/src.pro
--- 2/src/src.pro
+++ b/src/src.pro
@@@ -23,9 -29,17 +29,17 @@@ HEADERS += ui/mainwindow.h 
      map/mapscene.h \
      map/maptile.h \
      map/mapfetcher.h \
 -    common.h \
 +    map/mapcommon.h \
      ui/pixmap.h \
-     ui/infotab.h
+     ui/infotab.h \
+     ui/updatelocation/updatelocationdialog.h \
+     ui/updatelocation/texteditautoresizer.h \
+     situareservice/situareservice.h \
+     situareservice/situarecommon.h \
+     cookiehandler/cookiehandler.h \
+     facebookservice/facebookcredentials.h \
+     facebookservice/facebookauthentication.h \
+     facebookservice/facebookcommon.h
  QT += network \
      webkit