install template
Merge branch 'master' into mine
update with new template