Added all the templates
Merge branch 'templates' into merge-pool
Correct