Make changes as per task dsc-736
close div
Merge branch 'master' into bug/acm-dsc-736
close div
revert highlighting
Fix bug when auto uploading comasters
Merge pull request #700 from nla/bug/acm-dsc-736

modifications for check screen
Merge pull request #701 from nla/nn-uploadauto-comaster

Fix bug when auto uploading comasters
Merge branch 'master' into js-dsc240

Conflicts:
	src/banjo/controllers/JobsController.java