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

refs #6