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

Conflicts:
	src/main/java/EletroStore/dao/impl/ProductDaoIml.java