update gems
Merge branch 'updated-gems' into uicleanup