Merge branch 'release/first_release'
gemfile fix
Merge branch 'hotfix/gem_fix' into develop