Fix bug which caused custom templates to be stored permanently.
Merge pull request #24 from 4teamwork/jone-fix-permanent-custom-templates

Fix bug which caused custom templates to be stored permanently.