Merge branch 'master' into WL-3015

Conflicts:
	impl/src/main/java/uk/ac/ox/oucs/vle/CourseSignupServiceImpl.java