Merge branch 'master' into dm-working
Merge branch 'th-working' into dm-working
Merge branch 'master' into dm-working
updated seed data for MediaItems and AudioLessons
Merge branch 'dm-working'