Update Rails
Merge branch 'dev'