Fix wrong recipient type for template questions
Fix tests
Merge branch 'Issue2277' - hotpatch for: Receiver type of 'team peer eval" Q5 should be 'Giver's team members'
Fix issue
Fix tests
Merge branch 'Issue2278' - Fix for: JS for disabling contribution qn invalid giver/recipient not working
Merge branch 'master' into dev

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