Update rails to 4.1.0
Merge branch 'develop'