ExerciseCatalog.java UPDATE:
	- fixes
Quiz.java UPDATE:
	- fixes
QuizCatalog.java:
	- fixes
Merge branch 'master' of https://github.com/LievenNuyts/SteveLievenEmin