Fix conflitct
Merge origin/master

Conflicts:
	vues/javascript/fonctionsJavascript.inc.js