Fixes typo
Merge branch 'master' into switachable-template-support
Adds tasks to run getTemplatePath tests
Adds support for model generation using custom templates, this breaks scaffold and resource (for now)