Merge branch 'master' into dm-working
fix student/instructor account_type check method
Merge branch 'dm-working'