Fix pb bouton "Effectuer les changements" dans content/index
Merge remote-tracking branch 'origin/master'

Conflicts:
	module/content/config/changelog
	module/content/config/config.xml