Moved grades.js. Fixed issue-1224
Merge branch 'issue-1224'

Fix issue-1224.