Merge pull request #2 from hpnguyen/release1

Merge pull request #1 from hpnguyen/master
Use CKeditor to edit email template