Commit avant suppr du slug textuel des pharmacies
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/views/Base/basePharmacie.html.twig
	src/Pharmacoweb/SiteBundle/Resources/views/Base/default.html.twig

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