login ++++
Merge remote-tracking branch 'origin/Developpement' into Developpement

Conflicts:
	Nextwatt/application/controllers/login.php
eazrty
Merge remote-tracking branch 'origin/Developpement' into Developpement

Conflicts:
	Nextwatt/application/views/B2E/layout/default.php
looooogin
Merge remote-tracking branch 'origin/Developpement' into Developpement

Conflicts:
	Nextwatt/application/controllers/login.php
	Nextwatt/application/models/Mappage/user.php
Login