Lundi matin
Merge branch 'master' of https://github.com/pharmacoweb/application

Conflicts:
	src/Pharmacoweb/VenteBundle/Controller/CatalogueBackController.php