Attention au merge
2eme tebtative
3eme teteitne
Merge remote-tracking branch 'origin/Developpement' into Developpement

Conflicts:
	Nextwatt/application/controllers/CI_catalogue.php