Modifs page edition
Merge branch 'master' into Olivier-2014-07-10#1

Conflicts:
	fichiersDuProjet/assets/js/mode_edition.js
Merge branch 'Olivier-2014-07-10#1'