Merge branch 'master' into design-fixes
bang (!) seed data and update for new course model
Merge branch 'design-fixes'