updates for integration
upgrade gems
Merge branch 'master' into development