upgrade gemfile
Merge branch 'master' into development

Manual Merge Master