SOAP
Merge branch 'tubes4' of https://github.com/wilsonfonda/IF3038-2013 into tubes4

Conflicts:
	WebClient/nbproject/project.properties
	WebService/nbproject/project.properties