Merge branch 'master', remote-tracking branch 'upstream/master'
https://github.com/e-Luminate/eluminate_web/issues/88 - Allow participants
to belong to multiple categories
Merge pull request #98 from jogwen/multiple_categories_per_participant

Multiple categories per participant