Merge commun
Merge branch 'master' of https://github.com/Lpcm/cahier

Conflicts:
	index.js
	public/javascripts/form/pdfLoader.js
	public/javascripts/form/script_aff_scenario_formateur.js
	public/javascripts/lib/config.js