babb
Merge branch 'master' of https://github.com/nvquockhtn/BestBuy

Conflicts:
	Source/Eclipse/BestBuy/src/main/java/com/bestbuy/controller/HomeController.java
	Source/Eclipse/BestBuy/src/main/java/com/bestbuy/dao/ProductDaoImpl.java
	Source/Eclipse/BestBuy/src/main/java/com/bestbuy/pojo/Account.java
	Source/Eclipse/BestBuy/src/main/java/com/bestbuy/pojo/Accounttype.java
	Source/Eclipse/BestBuy/src/main/java/com/bestbuy/pojo/Comment.java
	Source/Eclipse/BestBuy/src/main/java/com/bestbuy/pojo/Image.java
	Source/Eclipse/BestBuy/src/main/java/com/bestbuy/pojo/Order.java
	Source/Eclipse/BestBuy/src/main/java/com/bestbuy/pojo/Orderdetail.java
	Source/Eclipse/BestBuy/src/main/java/com/bestbuy/pojo/Orderstate.java
	Source/Eclipse/BestBuy/src/main/java/com/bestbuy/pojo/Product.java
	Source/Eclipse/BestBuy/src/main/java/com/bestbuy/pojo/Receiver.java
	Source/Eclipse/BestBuy/src/main/resources/hibernate.reveng.xml
	Source/Eclipse/BestBuy/src/main/webapp/WEB-INF/jsp/page/IndexContent.jsp