Modification Categorie
Twig Produit
Merge branch 'master' of https://github.com/Pachenko/kaliBackOffice

Conflicts:
	src/Gbl/BackOfficeBundle/Entity/Categorie.php