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

Conflicts:
	loginscreen/main.cpp