Add template task saving and adding functionality
Merge branch 'template-tasks'