Merge CM CMS
Merge pull request #4 from phuong3030/merge-cms

Merge CM CMS