Fixed CriterionGrade coding properly
Merge branch 'master' of github.com:salient-systems/progress-workbook