update gemfile.lock
Merge branch 'dev'