Fix template
Merge branch 'master' into develop
Add template funciton
Create new VM from template image
Merge branch 'develop' into anna