Adding ability to delete templates
Merge branch master