Merge branch 'master' into disable_panels

Conflicts:
	src/ui/mainwindow.cpp

diff --cc src/engine/engine.cpp
Simple merge

diff --cc src/ui/mainwindow.cpp
index 3766c2c,d6ce628..d5aadae
--- 1/src/ui/mainwindow.cpp
--- 2/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@@ -324,10 -345,9 +345,13 @@@ void MainWindow::buildPanels(
      buildRoutingPanel();
  
      m_tabbedPanel = new TabbedPanel(this);
 -    m_tabbedPanel->addTab(m_userInfoPanel, QIcon(":/res/images/user_info.png"));
 -    m_tabbedPanel->addTab(m_friendsListPanel, QIcon(":/res/images/friend_list.png"));
++    
 +    m_situareTabsIndexes.append(
 +            m_tabbedPanel->addTab(m_userInfoPanel, QIcon(":/res/images/user_info.png")));
 +    m_situareTabsIndexes.append(
 +            m_tabbedPanel->addTab(m_friendsListPanel, QIcon(":/res/images/friend_list.png")));
++
+     m_tabbedPanel->addTab(m_locationSearchPanel, QIcon(":/res/images/compass.png"));
      m_tabbedPanel->addTab(m_routingPanel, QIcon(":/res/images/routing.png"));
  
      connect(m_mapView, SIGNAL(viewResized(QSize)),

diff --cc src/ui/mainwindow.h
Simple merge