Mini commit
Merge remote-tracking branch 'origin/Developpement' into Developpement

Conflicts:
	Nextwatt/application/views/B2E/Catalogue/Consulter_Catalogue.php