Added more templates
Mergin dev
Merge branch 'dev' into CTBranch
Merge branch 'dev' into CTBranch
Merge pull request #27 from Swap-Meet/CTBranch

Ct branch