Fix error in rails cache
Merge branch 'new-site-integration' into staging
Merge branch 'staging'