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

Conflicts:

	Nextwatt/application/views/B2E/Dossier_Archives/Dossier/choix_action_dossier.php