Merge branch 'master' into lampehe

Conflicts:
	src/src.pro
	tests/cookiehandler/testcookiehandler.cpp
	tests/testUI/testtabs/testtabs.cpp
	tests/testmap/testmapview/testmapview.cpp

diff --cc src/src.pro
index 55d7797,4f084e6..8f7c801
--- 1/src/src.pro
--- 2/src/src.pro
+++ b/src/src.pro
@@@ -29,14 -25,9 +29,14 @@@ HEADERS += ui/mainwindow.h 
      map/mapfetcher.h \
      common.h \
      ui/pixmap.h \
 -    ui/infotab.h
 +    ui/infotab.h \
 +    situareservice/situareservice.h \
 +    situareservice/situarecommon.h \
 +    cookiehandler/cookiehandler.h \
 +    facebookservice/facebookcredentials.h \
 +    facebookservice/facebookauthentication.h
  QT += network \
-       webkit
+     webkit
  
  # -----------------------------------------------------------------
  # Debian packetizing additions