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

Conflicts:
	app/Controllers/App_controller.php