Changing TemplateManager to TemplatesIterator
Merge remote-tracking branch 'HomagePrototypeRepo/master'