Merge pull request #1 from trucdh/master

THINKPHP EMAIL
Merge pull request #2 from trucdh/develop

Merge pull request #1 from trucdh/master