Commit jeudi 14h
Merge remote-tracking branch 'origin/Developpement' into Developpement

Conflicts:
	Nextwatt/application/third_party/dompdf/lib/fonts/log.htm
	Nextwatt/application/views/B2E/Accueil.php