Update to rails 4.0.0
Merge branch 'hotfix/rails4'