loc san pham
Merge branch 'master' of github.com:khanhminh/CellPhoneShop

Conflicts:
	cellphoneshop/src/main/java/cellphoneshop/dao/SanPhamDAO.java
	cellphoneshop/src/main/java/cellphoneshop/dao/SanPhamDAOImpl.java
	cellphoneshop/src/main/java/cellphoneshop/service/SanPhamService.java
	cellphoneshop/src/main/java/cellphoneshop/service/SanPhamServiceImpl.java