Avancement de tout
Merge branch 'master' of github.com:sitexw/Jam

Conflicts:
	app/controllers/admin/ingredients_controller.rb