api event
Merge master and khanh
Merge khanh and master
Add delete facility
Merge branch 'hung'
Facility Edit,New
Facility merge