Added support for lazy loading templates
Merge branch 'feature-event-delegation'