Fin de l'ajout des orders
Merge branch 'master' of github.com:sitexw/Jam

Conflicts:
	app/controllers/admin/orders_controller.rb