Merge origin/master

Conflicts:
	WebServiceAPI/src/java/pt/uc/aor/webservice/facade/ProductFacade.java
Merge origin/master