Cambios tipobeca
Merge remote-tracking branch 'origin/esteban-lopez' into paula

Conflicts:
	BECA2 Web/Servicios/TipoBeca.svc.cs
	BECA2 Web/Web/TipoBeca.aspx
	BECA2 Web/Web/js/Funcionalidad_TipoBeca.js
tipo
tipobeca
tipobeca_weconfig
paula_cambios
cambios_paula
Merge remote-tracking branch 'origin/paula'

Conflicts:
	BECA2 Web/BECA2.sln
	BECA2 Web/Servicios/Plan.svc.cs
	BECA2 Web/Servicios/Servicios.csproj
	BECA2 Web/Servicios/Web.config