Merge branch 'master' into dm-bu
Merge branch 'dm-bu' into dm-working
added isInstructor? and isStudent? methods
stash
Removed Progress class
Merge branch 'dm-cleanup' into dm-working
Merge branch 'dm-working'