Recup

Test
Merge branch 'Dev' of https://github.com/Projet-Nextwatt/B2E into Dev

Conflicts:
	Nextwatt/application/views/test.php