Merge branch 'master' into stacked_friends

Conflicts:
	images.qrc
	src/src.pro

diff --cc images.qrc
index 25c1ec6,db58073..2601bb4
--- 1/images.qrc
--- 2/images.qrc
+++ b/images.qrc
@@@ -16,9 -17,11 +17,12 @@@
          <file>res/images/side_bar_right.png</file>
          <file>res/images/sliding_bar_left.png</file>
          <file>res/images/sliding_bar_right.png</file>
-         <file>res/images/led_red_g.png</file>
-         <file>res/images/led_red_h.png</file>
+         <file>res/images/led_red.png</file>
          <file>res/images/led_red_s.png</file>
 +        <file>res/images/friend_group.png</file>
+         <file>res/images/list_item.png</file>
+         <file>res/images/list_item_bottom.png</file>
+         <file>res/images/list_item_middle.png</file>
+         <file>res/images/list_item_top.png</file>
      </qresource>
  </RCC>

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

diff --cc src/src.pro
index 9637e9a,10c60d8..40c31fb
--- 1/src/src.pro
--- 2/src/src.pro
+++ b/src/src.pro
@@@ -37,8 -36,7 +36,9 @@@ SOURCES += main.cpp 
      engine/engine.cpp \
      ui/settingsdialog.cpp \
      map/maptilerequest.cpp \
 -    ui/imagebutton.cpp
++    ui/imagebutton.cpp \
 +    map/friendgroupitem.cpp \
 +    map/frienditemshandler.cpp
  HEADERS += ui/mainwindow.h \
      ui/mapviewscreen.h \
      ui/listviewscreen.h \
@@@ -72,11 -69,11 +71,13 @@@
      engine/engine.h \
      ui/settingsdialog.h \
      map/maptilerequest.h \
 -    ui/imagebutton.h
++    ui/imagebutton.h \
 +    map/friendgroupitem.h \
 +    map/frienditemshandler.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)