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

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