Merge branch 'master' into new_info_panels

diff --cc src/src.pro
index df2ee66,21d8e09..8c038d1
--- 1/src/src.pro
--- 2/src/src.pro
+++ b/src/src.pro
@@@ -70,11 -69,10 +70,11 @@@ HEADERS += ui/mainwindow.h 
      ui/situareuser.h \
      engine/engine.h \
      ui/settingsdialog.h \
 -    map/maptilerequest.h
 +    map/maptilerequest.h \
 +    ui/friendlistpanel.h
  QT += network \
      webkit
- DEFINES += QT_NO_DEBUG_OUTPUT
+ #DEFINES += QT_NO_DEBUG_OUTPUT
  !maemo5 { 
      message(QJson built in)
      message(Make sure you have QJson development headers installed)