Update rails and gems
Merge branch 'develop'