Update gems
Merge branch 'develop'