Merge branch 'hotfix/gemfile-development'
a
Merge branch 'hotfix/travis' into develop