update gems
Merge branch 'updated-gems' into uicleanup
Merge branch 'uicleanup' into foodcoop-adam

Conflicts:
	Gemfile.lock