Fixed broken quiz locking/unlocking functionality
Merge remote-tracking branch 'origin/develop' into develop