Removing template file, as was part of the old VM
Merge branch 'dev'
Removing template file, as was part of the old VM