pdt par categ
Merge branch 'master' of https://github.com/Nymphadelle/Phyllali

Conflicts:
	Resources/javascript.js
Merge branch 'master' of https://github.com/Nymphadelle/Phyllali
affichage produit, categories..
Merge branch 'master' of https://github.com/Nymphadelle/Phyllali