Commit Lundi matin
Merge remote-tracking branch 'origin/Developpement' into Developpement

Conflicts:
	Nextwatt/application/libraries/fonctionspersos.php
AH AH AH
Merge remote-tracking branch 'origin/Developpement' into Developpement

Conflicts:
	Nextwatt/application/libraries/fonctionspersos.php
COOOOOOOMMMMMIIIITTTTTT
Commit mardi matin
Merge remote-tracking branch 'origin/Developpement' into Developpement