Fix Gemfile.lock
Merge branch 'hotfix'