kuis
Merge remote-tracking branch 'origin/master'

Conflicts:
	addons/shared_addons/modules/quiz/config/routes.php