Add timeout and fix legend styling when updating trial exams too
Merge branch 'master' into exam-view-fixes
Merge pull request #7 from danlamb/exam-view-fixes

Exam view fixes