Made view.ts template engine agnostic
Merged origin/master