Recup deux commits
Merge remote-tracking branch 'origin/Developpement' into Developpement

Conflicts:
	Nextwatt/application/third_party/dompdf/lib/fonts/log.htm