Merge branch 'hotfix/admin_course_bug'
Merge branch 'release/v0.9.14'
Update gem
Fixed caching error, should now cache in the right context
Merge branch 'hotfix/cachefail' into develop