use rails 4.0.0
Merge branch 'master' into rails4
rails4 changes
Merge branch 'rails4'