Merge branch 'master' of https://github.com/MapleNoise/CCB-Projet into bug_produit

Conflicts:
	config/routes.rb
Merge branch 'bug_produit' of https://github.com/MapleNoise/CCB-Projet into bug_produit

Conflicts:
	config/routes.rb