upgraded rails
fixed typo
Merge branch 'upgrade_rails'