maj Web Supervisor
Merge remote-tracking branch 'origin/master'

Conflicts:
	ProjetMobileClamperl/JS/clamperl.js
	ProjetMobileClamperl/index.jsp