update
đăng ký, confirm
fix conflict
fix conflict2
Merge branch 'master' of https://github.com/hoangkianh/KimFashion

Conflicts:
	nbproject/private/private.xml