update rails version
Merge branch 'update_site' into develop
Merge branch 'release-1.17'