Evaluation Questions Bugfix

Fixed a bug that was causing the evaluation questions page to throw an
error.
Merge remote-tracking branch 'origin/cwDev'