phan quyen
Merge branch 'master' of github.com:khanhminh/CellPhoneShop

Conflicts:
	cellphoneshop/src/main/java/cellphoneshop/service/NguoiDungServiceImpl.java