edit time events
edit datetime
secure api
Merge branch 'master' of github.com:github15693/rms
Merge branch 'master' of github.com:github15693/rms into khanh
Merge branch 'hung'
Merge branch 'master' of github.com:github15693/rms