moved `IncludedTemplate` into the regular template API, fixed more unittests

--HG--
branch : trunk
9 files changed