Maj Quentin
Merge remote-tracking branch 'origin/master'

Conflicts:
	appliQCM/WebContent/WEB-INF/web.xml
	appliQCM/WebContent/formateur/nouveauTest.jsp