Fix null pointer exception on Assessments
Merge branch 'dev'