22upgrade rails
Merge pull request #1 from byzg/upgrade_rails_2

22upgrade rails