update rails
Merge branch 'development'