clean up template files
Merge branch 'local'