Change assert statements
Disable options that should  not be selected.
Fix some tests
Merge branch 'master' into Issue2383
Fix JS
Fix tests
Force invalid feedback giver/recipient to valid ones and inform user
Fix for showing status to user
Add tests
Merge remote-tracking branch 'origin/master' into Issue2383
Fix typo and reduce nesting
[Issue2383] java.lang.AssertionError: Contrib qn giver type invalid: TEAMS expected: but was: