Affichage catalogue chelou retour à la case départ
Affichage catalogue SwaaaagggGGGggGgGg    RRRrrrr!!! (Mais cette fois genre vraiment quoi)
Merge remote-tracking branch 'origin/Developpement' into Developpement

Conflicts:
	Nextwatt/application/controllers/CI_catalogue.php
	Nextwatt/application/views/B2E/Catalogue/Consulter_Catalogue.php
	Nextwatt/upload/catalogue.txt