recup
Merge branch 'Developpement' of https://github.com/Projet-Nextwatt/B2E into Developpement

Conflicts:
	Nextwatt/nbproject/private/private.xml