Merge branch 'master' into dev

Conflicts:
	src/test/resources/pages/studentCourseJoinConfirmationHTML.html
Merge branch 'dev' into AccessControl

Conflicts:
	src/test/resources/pages/studentCourseJoinConfirmationHTML.html