Merge origin/master

Conflicts:
	WebServiceAPI/src/java/pt/uc/aor/webservice/API/REST.java
	WebServiceAPI/src/java/pt/uc/aor/webservice/API/SOAP.java