Merged master with test script modifications

Conflicts:
	tests/ui/friendlist/friendlist.pro

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

diff --cc tests/ui/friendlist/friendlist.pro
index ae941ea,0000000..94de6d8
mode 100644,000000..100644
--- 1/tests/ui/friendlist/friendlist.pro
--- /dev/null
+++ b/tests/ui/friendlist/friendlist.pro
@@@ -1,16 -1,0 +1,15 @@@
 +CONFIG += qtestlib
 +DEFINES += QT_NO_DEBUG_OUTPUT
 +INCLUDEPATH += . \
 +    ../../../src/
 +HEADERS += ../../../src/ui/friendlistview.h \
 +    ../../../src/ui/friendlistitem.h \
 +    ../../../src/user/user.h \
 +    ../../../src/ui/avatarimage.h \
-     ../../../src/common.h \
 +    ../../../src/ui/imagebutton.h
 +SOURCES += ../../../src/ui/friendlistview.cpp \
 +    ../../../src/ui/friendlistitem.cpp \
 +    ../../../src/user/user.cpp \
 +    ../../../src/ui/avatarimage.cpp \
-     testfriendlist.cpp \
-     ../../../src/ui/imagebutton.cpp
++    ../../../src/ui/imagebutton.cpp \
++    testfriendlist.cpp