Added tags for vlans.
Fixed VM creation.
Fixed VM creation.
Merge branch 'test' into dev