Fix specs. Integrates scoped_caching properly to all relevant controllers
merge master into staging