bug fix for template error.
Merge branch 'zhcard_dev' of https://github.com/AndreLesa/mwana into zhcard_dev