kuis
Merge remote-tracking branch 'origin/master'

Conflicts:
	addons/shared_addons/modules/quiz/controllers/quiz.php
	addons/shared_addons/themes/innovate/views/modules/quiz/pages.php