Update master

Merged Fabian Nuraddin Alexander Gabel requested to merge dev into master

important change regarding bsom quizzes

Merge request reports