Update gems
Update rails to 4.1.5
Merge branch 'develop'