Do not override template directory
Merge branch 'gk-smarty-6' into develop

refs #6
erge branch 'develop': release 0.5.3