Rebase of workgroup cohorts change
revert-multiple-cohorts: Add checks in code and a management command to ease the revert
Merge pull request #258 from aboudreault/cohorts-rebase

Cohorts rebase