Upload commit
Merge branch 'master' of https://github.com/sergioariza/MusitekaWebServices

Conflicts:
	WebContent/WEB-INF/WS_NavegacionService/webServices/deploy.wsdd
	WebContent/WEB-INF/server-config.wsdd
	WebContent/WEB-INF/web.xml
	WebContent/wsdl/WS_Navegacion.wsdl
	src/webServices/WS_Navegacion.java