Merge origin/master

Conflicts:
	GrossistaWebService/src/java/pt/uc/dei/aor/projeto7/grupoc/facades/ProductFacade.java
Merge origin/master

Conflicts:
	GrossistaWebService/src/java/pt/uc/dei/aor/projeto7/grupoc/facades/ProductFacade.java
Merge origin/master
Merge origin/master
Merge origin/master
Merge origin/master

Conflicts:
	GrossistaWebService/src/java/pt/uc/dei/aor/projeto7/grupoc/facades/ProductFacade.java