Merge origin/master

Conflicts:
	WebServiceAPI/src/java/pt/uc/aor/webservice/entity/SellProduct.java
	WebServiceAPI/src/java/pt/uc/aor/webservice/facade/Order.java
	WebServiceAPI/src/java/pt/uc/aor/webservice/facade/SellProductFacade.java