Merge branch 'new_panels' into locationlistview

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

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

diff --cc src/ui/friendlistpanel.cpp
Simple merge

diff --cc src/ui/mainwindow.cpp
index 327c643,16ea4fd..570dc67
--- 1/src/ui/mainwindow.cpp
--- 2/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@@ -312,9 -317,8 +319,9 @@@ void MainWindow::buildPanels(
      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_tabbedPanel->addTab(m_routingPanel, QIcon(":/res/images/routing.png"));
  
-     connect(m_tabbedPanel, SIGNAL(panelOpened()),
+     connect(m_tabbedPanel, SIGNAL(tabChanged()),
              m_friendsListPanel, SLOT(clearFriendListFilter()));
  
      connect(m_mapView, SIGNAL(viewResized(QSize)),