Fix issue #2: Scaffolding: Replace "template" with the qualifier
Merge branch 'master' of https://github.com/cpf/Templating