Merge branch 'tools' into friends

Conflicts:
	src/facebook/facebookinterface.cpp
	tests/socialtest/socialtest.qml
Adaptation for Friends-QML