Update gems
Update rails to v4.1.1
Merge branch 'develop'