bump rails version
Merge branch 'bump_rails_version' into develop
Merge branch 'release-0.1'