updated Gemfile and Gemfile.lock to reflect the updated gems
Merge branch 'master' into deployment