Make sure templates from within Folders can be used.
Add test for using templates in folders.
Add test for using template in root.
Merge remote-tracking branch 'touch/fix-template-retrieval'