fix bug in templates
Merge branch 'master' of https://github.com/smart-app/server