Added vhd-util to .gitignore
Resource metadata support for Site2SiteVpnGateway

Conflicts:
	setup/db/db/schema-421to430.sql
Resource metadata support for customer gateway

Conflicts:
	server/src/com/cloud/tags/TaggedResourceManagerImpl.java