update hóa đơn
fix conflict
Merge branch 'master' of https://github.com/hoangkianh/KimFashion

Conflicts:
	nbproject/private/private.xml
	web/WEB-INF/struts-config.xml