fr
Merge branch 'master' of https://github.com/flousse/homazing

Conflicts:
	config/globals.ini