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

Conflicts:
	client/app/admin/admin.html
	client/app/subformeditor/subformeditor.html

Fixed misc bugs that I created in the submission form editor.
Merge branch 'master' of https://github.com/casal033/UMM3601ursamajor

Conflicts:
	client/app/subformeditor/subformeditor.controller.js
Merge branch 'master' of https://github.com/casal033/UMM3601ursamajor
Updated submission list details view selection to work with new tabs filters. Set stats view as the default view for the admin page.
Misc Edits to admin page, fixed some visual bugs with containers on the form editor and user editor.