Merge origin/AleM into DavidS

Conflicts:
	servicio2/web/darDeAlta.jsp
	servicio2/web/horario2.jsp
	servicio2/web/index.jsp
	servicio2/web/informacionGeneral.jsp
	servicio2/web/inscripcion.jsp
	servicio2/web/llegadas.jsp
	servicio2/web/modificar.jsp
	servicio2/web/modificar2.jsp
	servicio2/web/modificarT2.jsp
	servicio2/web/ninos.jsp
	servicio2/web/salidas.jsp