Gestion des couleurs pages commerce et nv picto like
Conflit commerce.php resolve

Conflicts:
	pages/commerce.php
Merge branch 'master' of https://github.com/antoinerapy/uniiti