added template resolver
Merge branch 'feature/template-resolver' into develop