Signed-off-by: rjeanjean <remy.jeanjean@gmail.com>
Merge branch 'master' of https://github.com/pharmacoweb/application.git

Conflicts:
	src/Pharmacoweb/SiteBundle/Controller/AdminController.php
	src/Pharmacoweb/SiteBundle/Resources/config/routing.yml
	src/Pharmacoweb/VenteBundle/Controller/CatalogueController.php
	web/bundles/pharmacowebdefaut/css/pharmacies.less

Signed-off-by: rjeanjean <remy.jeanjean@gmail.com>