template: fixed old escape macro [#345]
removed usuned files [#345]
template filters decoupled [#345]
generator resolvers decoupled [#345]
resolvers events added [#345]
HtmlGenerator - removed decoupled template logic [#345]
extension updated with new services [#345]
Merged 'filter' branch