"kk
Merge branch 'master' of https://github.com/flousse/The-whole

Conflicts:
	config/globals.ini
Ptits modifs