nouvelle branche
Merge branch 'origin/master'

Conflicts:
	config.inc.php
Merge branch 'origin/1.0.0'