vm capabilities
vlan capabilities
fixed override annotation
Merge pull request #70 from daniellemayne/develop

Develop - added capabilities support for vm and vlan