Added actionpack-caching
Merge branch 'master' into with_caching
Remove actioncontroller caching from Gemfile