Quiz
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebCTToMoodlePlugin/webcttomoodle/classes/model/GlobalModel.php
	WebCTToMoodlePlugin/webcttomoodle/classes/model/WebCTModel.php
	WebCTToMoodlePlugin/webcttomoodle/classes/model/activities/Quiz.php