Merge pull request #12 from nukeviet/develop

Develop
format template theme
Merge pull request #31 from vuthao/develop

Develop