Merge branch 'wallika-own'

Conflicts:
	src/ui/mapviewscreen.cpp

diff --combined src/src.pro
index 5d84c02,25445a3..692831f
--- 1/src/src.pro
--- 2/src/src.pro
+++ b/src/src.pro
@@@ -8,13 -8,19 +8,19 @@@ SOURCES += main.cpp 
      ui/mainwindow.cpp \
      ui/mapviewscreen.cpp \
      ui/listviewscreen.cpp \
+     situareservice/situareservice.cpp \
+     cookiehandler/cookiehandler.cpp \
+     facebookservice/facebookcredentials.cpp \
+     facebookservice/facebookauthentication.cpp \
      map/mapengine.cpp \
      map/mapview.cpp \
      map/mapscene.cpp \
      map/maptile.cpp \
      map/mapfetcher.cpp \
      ui/pixmap.cpp \
-     ui/infotab.cpp
+     ui/infotab.cpp \
+     ui/updatelocation/updatelocationdialog.cpp \
+     ui/updatelocation/texteditautoresizer.cpp
  HEADERS += ui/mainwindow.h \
      ui/mapviewscreen.h \
      ui/listviewscreen.h \
@@@ -23,20 -29,20 +29,28 @@@
      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
  
 +# use don't use OpenGL when building in scratchbox
 +!maemo5 { 
 +    QT += opengl
 +    message(OpenGL built in)
 +    message(Make sure you have OpenGL development headers installed)
 +    message(install headers with: sudo apt-get install libgl-dev libglu-dev)
 +}
 +
  # -----------------------------------------------------------------
  # Debian packetizing additions
  # -----------------------------------------------------------------
@@@ -64,4 -70,3 +78,4 @@@ unix 
      target.path = $$BINDIR
      INSTALLS += target
  }
 +RESOURCES +=