fix path to template dir
Merge branch 'develop'