Merge
Merge
Merge
Merge branch 'master' of https://github.com/thomn/projet_qcm

Conflicts:
	QCM/src/jtaga/jee/qcm/exceptions/JtagaException.java