cambios menores
Merge branch 'master' of https://github.com/oskitar89/SOR_FINAL

Conflicts:
	gestor_servicio/gestor_servicio/Web.config