api event
Merge master and khanh
Merge khanh and master
Merge branch 'hung'