Fix test related to course_groups
Fix some more rebase issues in django_comment_client
Merge pull request #149 from aboudreault/course-groups-tests-fix

Fix test related to course_groups