update to rails 4.0.0!
Merge branch 'develop'