Merging in frontend and grader.js from branch bp
Merge branch 'bp'
One last rename