Merge branches 'master' and 'rails4' into rails4
rake rails:update:bin
Merge pull request #5 from WIZARD221/rails4

Rails4