Merge pull request #1229 from ariannedee/master

Closes #1194 Add order (position) to grade entry form items