Merge branch 'JABAWS_Release_2_5' into develop

Merge branch 'JABAWS_Release_2_5' into develop

Conflicts:
	.project
	WEB-INF/sun-jaxws.xml
	conf/Executable.properties
	testsrc/compbio/data/sequence/SequenceUtilTester.java
	webservices/compbio/data/msa/Category.java
	webservices/compbio/ws/client/Jws2Client.java
	webservices/compbio/ws/client/Services.java
	webservices/compbio/ws/client/WSTester.java
	webservices/compbio/ws/server/WSUtil.java
	webservices/compbio/ws/server/resource/AAConWS.wsdl
	webservices/compbio/ws/server/resource/AAConWS_schema1.xsd
	webservices/compbio/ws/server/resource/ClustalWS.wsdl
	webservices/compbio/ws/server/resource/ClustalWS_schema1.xsd
	webservices/compbio/ws/server/resource/DisemblWS.wsdl
	webservices/compbio/ws/server/resource/DisemblWS_schema1.xsd
	webservices/compbio/ws/server/resource/GlobPlotWS.wsdl
	webservices/compbio/ws/server/resource/GlobPlotWS_schema1.xsd
	webservices/compbio/ws/server/resource/IUPredWS.wsdl
	webservices/compbio/ws/server/resource/IUPredWS_schema1.xsd
	webservices/compbio/ws/server/resource/JronnWS.wsdl
	webservices/compbio/ws/server/resource/JronnWS_schema1.xsd
	webservices/compbio/ws/server/resource/MafftWS.wsdl
	webservices/compbio/ws/server/resource/MafftWS_schema1.xsd
	webservices/compbio/ws/server/resource/MuscleWS.wsdl
	webservices/compbio/ws/server/resource/MuscleWS_schema1.xsd
	webservices/compbio/ws/server/resource/RegistryWS.wsdl
	webservices/compbio/ws/server/resource/RegistryWS_schema1.xsd
	webservices/compbio/ws/server/resource/TcoffeeWS.wsdl
	webservices/compbio/ws/server/resource/TcoffeeWS_schema1.xsd
	wsbuild.xml