Modify gemfile
Merge branch 'hotfix/gemfile' into develop