Merge branch 'new_panels' into locationlistview

diff --cc src/src.pro
index bb9d204,81e5c75..714164a
--- 1/src/src.pro
--- 2/src/src.pro
+++ b/src/src.pro
@@@ -69,10 -59,13 +69,9 @@@ SOURCES += main.cpp 
      ui/userinfopanel.cpp \
      ui/zoombutton.cpp \
      ui/zoombuttonpanel.cpp \
 -    ui/listview.cpp \
 -    ui/listitem.cpp \
 -    ui/listitemdelegate.cpp \
 -    ui/friendlistitemdelegate.cpp \
      ui/searchdialog.cpp \
-     ui/panelbase.cpp \    
      ui/panelbar.cpp \
-     ui/panelcontent.cpp \
+     ui/panelcontentstack.cpp \
      ui/paneltab.cpp \
      ui/paneltabbar.cpp \
      ui/tabbedpanel.cpp \