gemfile changes
Merge branch 'development'
bundle install
Merge branch 'development'
conflict removed
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
conflict removed
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'