update gems
Merge branch 'development' of github.com:6fusion/adaptor-vmware into development

Conflicts:
	Gemfile
	Gemfile.lock