Merge branch 'dev'
Add gemfile