Admin: Xóa sp xong
Fix conflict
Fix conflict
fix conflict
Merge branch 'master' of https://github.com/hoangkianh/KimFashion

Conflicts:
	web/pages/success.jsp