Update master

Fabian Nuraddin Alexander Gabelrequested to merge
dev into master

important change regarding bsom quizzes

Merge request reports