Merge branch 'master' of https://github.com/casal033/UMM3601ursamajor

Conflicts:
	client/components/sublist/sublist.html

Did a bit more with resubmissions. Non admins will now be redirected to the submission form by the resubmit button, admin stats view now includes some resubmit stats.