Merge branch 'master' into work
update Gemfile

use ruby 2.1.1
bundle update
Merge branch 'work'