persistance qui fonctionne au p**** d'oignon
Merge branch 'master' of https://github.com/Chisci/QcmManager.git

Conflicts:
	src/main/webapp/WEB-INF/pages/welcome.jsp