copied online version, re-committed to solve merge conflict
Merge remote-tracking branch 'origin/master'
initial test class for Quizcatalogus - to be updated