Multi-template feature.
Merge remote-tracking branch 'refs/remotes/qcubed/alpha-3.0' into feature-multiTemplate
Merge pull request #542 from qcubed/feature-multiTemplates3

Feature multi templates3