Merge branch 'evaluation-overview-place' into release-y
SWC-650
SWC-654: make join widget support subchallenges
Merge commit '783ecda' into develop
Merge commit 'c1631b8' into develop
Merge pull request #372 from jay-hodgson/develop

SWC-650, SWC-654: merge changes from release-y down to develop