SC14 so khai, chua can chinh va ve bang
Fix conflict
Fix conflict new
Fix thinhnv branch
Merge phan anh Thinh