Cap nhat thong tin tai khoan - khong vo duoc controller/UpdateAccountController.java khi cap nhat mat khau
Merge branch 'master' of https://github.com/khanhminh/CellPhoneShop

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