merge incomming
Merge branch 'master' of https://github.com/Tchaokko/babel

Conflicts:
	loginscreen/HandleProtocol.cpp