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

Conflicts:
	src/Pharmacoweb/VenteBundle/Entity/Categorie.php
	src/Pharmacoweb/VenteBundle/Entity/Categorie.php~
	src/Pharmacoweb/VenteBundle/Entity/Contreindication.php~
	src/Pharmacoweb/VenteBundle/Entity/Posologie.php~
	src/Pharmacoweb/VenteBundle/Entity/Produit.php~