Merge branch 'hotfix/Rakefile'
correcting Gemfile
Merge branch 'hotfix/Rake' into develop