Merge branch 'master' of https://github.com/cmma86/sor_presa

Conflicts:
	taller_web/plataforma_web/App_WebReferences/ReferenciaServicioSOR/Service1.wsdl
Merge branch 'master' of https://github.com/cmma86/sor_presa.git