rebuild Gemfile.lock
Merge branch 'develop'