Merge pull request #17 from G5/upgrade-rails

Upgrade rails
Merge branch 'master' into upgrade-rails