Merge pull request #5 from WIZARD221/rails4

Rails4
Merge pull request #6 from WIZARD221/rails4

rails4 production.rb with
Merge branch 'master' into rails4