improved the templates
Merge branch 'vmprovisioning' into develop