Changing camel casing for ORCID
Merge branch 'dev-orcid-integration' into dev-moodle-room

Conflicts:
	src/main/webapp/pages/authenticated.ftl