gem update
Merge branch 'master' of github.com:ophrescue/RescueRails