Merge branch 'develop' into staging
Merge branch 'staging'
Merge branch 'develop' into staging
Merge branch 'staging'
HOTFIX: Removed quiz references to prevent Heroku from crashing
Merge branch 'master' into develop