Update rails to 4.2
Merge branch 'develop'