Merge branch 'master' into friendlist

diff --cc src/map/mapengine.cpp
index 7217062,06c2526..6c5b023
--- 1/src/map/mapengine.cpp
--- 2/src/map/mapengine.cpp
+++ b/src/map/mapengine.cpp
@@@ -69,14 -74,9 +74,14 @@@ MapEngine::MapEngine(QObject *parent
  
      connect(this, SIGNAL(friendsLocationsReady(QList<User*>&)),
              m_friendItemsHandler, SLOT(friendListUpdated(QList<User*>&)));
 +
 +    connect(m_friendItemsHandler, SIGNAL(friendItemClicked(QString)),
 +            this, SIGNAL(friendItemClicked(QString)));
 +    connect(m_friendItemsHandler, SIGNAL(friendGroupItemClicked(QList<QString>)),
 +            this, SIGNAL(friendGroupItemClicked(QList<QString>)));
  }
  
- void MapEngine::init()
+ QRect MapEngine::calculateTileGrid(QPoint sceneCoordinate)
  {
      qDebug() << __PRETTY_FUNCTION__;
  

diff --cc src/map/mapengine.h
Simple merge