Merge branch 'development'
Updating Gemfile