Correction des merdes de git zub
Modification de creer tableau
recup?
Merge remote-tracking branch 'origin/Developpement' into Developpement

Conflicts:
	Nextwatt/application/controllers/CI_client.php
	Nextwatt/application/models/Mappage/user.php
	Nextwatt/upload/catalogue.txt