Cococommit ! (du mardi aprem)
Merge remote-tracking branch 'origin/Developpement' into Developpement

Conflicts:
	Nextwatt/upload/catalogue.txt