dev test
Merge branch 'master' of https://github.com/atmoner/Smarty-hook