change ui
merge nhan_dev
Merge branch 'test' of github.com:vuphamhoai/Cloud into test
chang ui
fixed conflict
change ui
merge nhan_dev
merged