bundle update on restart
caching and strong params fixes
Merge branch 'master' into ap