changed template engine for view matches
Merge branch 'master' into tmp