resolve conflict on rebase
get courses by reversing django groups for non global users (studio dashboard)
STUD-1133
Merge pull request #2423 from edx/zub/story/std1133-studioedgelogin

try to get courses by django groups for non global users