add templates page
add in watch for templates and match the column mixin
Merge branch 'feature/templates' into develop