Renaming constant
Renaming constant
Incrementing release
Class name refactor
Refactor for better null safety
Merge branch 'dev-orcid-integration' into dev-moodle-room
A bit of refactoring and some documentation improvements as well as turning on one time token authentication for password resets.

AMEC-2258
AMEC-2259
Adding userProfile to model passed to freemarker, AMEC-2259
Passwords now are trimmed
Fixing bad result type
Removing deprecated comment
Refactoring fetching of user roles to the base class
Merge branch 'dev-orcid-integration' into dev-moodle-room

Conflicts:
	src/main/webapp/pages/forgotPassword.ftl
	modified:   src/main/webapp/pages/changePassword.ftl
Merge branch 'dev-orcid-integration' into dev-moodle-room
Merge branch 'dev-orcid-integration' into dev-moodle-room
Merge branch 'dev-orcid-integration' into dev-moodle-room

Conflicts:
	src/main/webapp/pages/authenticated.ftl
Merge branch 'dev-orcid-integration' into dev-moodle-room

Conflicts:
	src/main/webapp/pages/changePassword.ftl
	src/main/webapp/pages/forgotPassword.ftl
Merge branch 'master' into dev-moodle-room
Removing page no longer used