Get hjs templates to work.
Merge branch 'templates'