Merge branch 'master' into api

Conflicts:
	build_deps/deployed_deps.txt
Merge branch 'api' of github.com:sfu-fas/coursys into api
add marking details to grade API view... sort of