Fix product (trung ten, xoa)
Merge remote-tracking branch 'origin/master'