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
servicios curso
Merge remote-tracking branch 'origin/Wen' into Wen

Conflicts:
	BECA2 Web/BECA2.sln
	BECA2 Web/Servicios/Servicios.csproj
	BECA2 Web/Servicios/Web.config
servicios
servicios
Merge remote-tracking branch 'origin/esteban-lopez' into Wen

Conflicts:
	BECA2 Web/BECA2.sln
	BECA2 Web/Servicios/Properties/AssemblyInfo.cs
	BECA2 Web/Servicios/Servicios.csproj
	BECA2 Web/Servicios/Web.config
	BECA2 Web/Web/Web.csproj
listo
tipobeca_weconfig
paula_cambios
Servicio Requisito

Servicio Requisito
Interfaz
cambios_paula
ignore
servicios becas, solicitudes y perfil
Merge remote-tracking branch 'origin/jorge.argds'

Conflicts:
	BECA2 Web/BECA2.sln
	BECA2 Web/BLL/BLL.csproj
	BECA2 Web/Servicios/Plan.svc.cs
	BECA2 Web/Servicios/Properties/AssemblyInfo.cs
	BECA2 Web/Servicios/Servicios.csproj
	BECA2 Web/Servicios/Web.config
Merge branch 'marco-rodriguez' of https://github.com/KOIP2/AplicacionBeca2-KOI into marco-rodriguez

Conflicts:
	BECA2 Web/BECA2.sln
	BECA2 Web/Servicios/Servicios.csproj
	BECA2 Web/Servicios/Web.config
	BECA2 Web/Web/Web.csproj
Merge remote-tracking branch 'origin/esteban-lopez'

Conflicts:
	BECA2 Web/Servicios/Servicios.csproj
	BECA2 Web/Servicios/Web.config