cohorts can now be assigned to a phase
Merge branch 'development' of github.com:supertopher/play_dough into development