update rails 4
Merge branch 'release/v0.8.5'