grades popup details
Merge branch 'master' of https://github.com/marcusglowe/checkmark

Conflicts:
	gr5/static/js/grades.js