-Justin branch
Merge branch 'justin'

Conflicts:
	app/controllers/commandes_controller.rb
	app/views/commandes/confirmation.erb