Avancement sur la page home
Merge branch 'dev' of https://github.com/frco9/ecobox into dev

Conflicts:
	app/controllers/home_controller.rb