Changed javascript declaration to use jQuery for better cross-platform support
Merge branch 'master' of https://github.com/redbox-mint/redbox
Merge branch 'master' into redbox-1.7

Conflicts:
	config/src/main/config/portal/dashboard/dashboard/form-components/dmptform-footer.vm
	config/src/main/config/portal/dashboard/dashboard/form-components/self-submissionform-footer.vm