coooomit
Merge remote-tracking branch 'origin/Developpement' into Developpement

Conflicts:
	Nextwatt/application/controllers/login.php
	Nextwatt/application/helpers/assets/js/login.js
Login (connexion)