Merging dev branch
Update Gemfile
Merge branch 'master' into dev