Get GR working after last rebase.
Merge remote-tracking branch 'origin/gr-rebased' into gr-rebased

Conflicts:
	src/main/java/org/cru/crs/service/ConferenceService.java