Merge branch 'master' of https://github.com/lacorneka/EletroStore into hung

Conflicts:
	src/main/java/EletroStore/dao/impl/ProductDaoIml.java
no message
Merge branch 'hung'

Conflicts:
	.classpath
	src/main/java/EletroStore/controller/ProductController.java
	src/main/java/EletroStore/controller/WishlistController.java
	src/main/java/EletroStore/dao/ProductDao.java
	src/main/java/EletroStore/dao/impl/ProductDaoIml.java
	src/main/webapp/WEB-INF/jsp/cart.jsp
	src/main/webapp/WEB-INF/jsp/listproducts.jsp