Merge pull request #40 from mileswright/master

Grades Tab changes
Fixed naming for gradingType