#13 Correction des erreurs checkstyle 1
#13 Correction des erreurs checkstyle 2
correction du javadoc testXMLQuizzToJson #4
Merge branch 'master' into feature/quizzConverter

Conflicts:
	src/test/java/dcll/grp3/morphoQuizz/QuizzConverterTest.java