edit gemfile
Merge branch 'devel'