Commit avec le theme ace
Merge remote-tracking branch 'origin/Developpement' into Developpement

Conflicts:
	Nextwatt/application/views/welcome_message.php
Commit travail shany (form client)
Commit travail shany (form client)
Commit travail shany (form client)
Commit travail shany (form client)
Commit travail shany (form client)
Commit travail shany (form client)
Merge branch 'Developpement' of https://github.com/Projet-Nextwatt/B2E into Developpement