Merge branch 'tools' into friends

Conflicts:
	src/facebook/facebook.pri
	src/facebook/facebookinterface.cpp
Adaptation for friends