Updated gemfile
Merge branch 'development'