Quelques modifs
Merge branch 'Developpement' of https://github.com/Projet-Nextwatt/B2E into Developpement
Commit.
Merge remote-tracking branch 'origin/Developpement' into Developpement

Conflicts:
	Nextwatt/application/controllers/CI_dossier.php
	Nextwatt/application/models/Mappage/article.php