Update rails to 4.1.4
Merge branch 'develop'