added functionality to support vcloud catalogs
Merge remote-tracking branch 'origin/VCloud'

Conflicts:
	Gemfile
	Gemfile.lock