commit de l'espoir :)
Merge branch 'mizielr'

Conflicts:
	app/Controller/HomeController.php
	app/View/Home/inc/header.php
	app/webroot/js/js.js