TemplateFactory class now takes responsibility of loading templates. TemplateFactory has event onTemplateLoad and onLayoutLoad.
Merge branch 'master' of git://github.com/vysinsky/sandbox

Conflicts:
	composer.json