fix cac the loai loi refresh/cancel khi edit
Merge branch 'master' of https://github.com/hoangdd/7maru
Merge branch 'master' of https://github.com/hoangdd/7maru
Merge branch 'master' of https://github.com/hoangdd/7maru