Merge origin/master

Conflicts:
	src/java/pt/uc/dei/paj/projeto4/grupoi/soapWs/SoapWebService.java
Merge origin/master

Conflicts:
	src/java/Interface/ApRest.java