app config
Merge remote-tracking branch 'origin/master' into marco-rodriguez

Conflicts:
	BECA2/UI/App.config
Merge remote-tracking branch 'origin/esteban-lopez' into marco-rodriguez
Merge remote-tracking branch 'origin/esteban-lopez' into marco-rodriguez
Merge remote-tracking branch 'origin/esteban-lopez' into marco-rodriguez
Parte grafica para agregar planes

Solo hice los forms, no me da tiempo para hacer el resto
xd
Esteban
Merge remote-tracking branch 'origin/marco-rodriguez'
Merge remote-tracking branch 'origin/paula'

Conflicts:
	BECA2 Web/Servicios/Servicios.csproj
	BECA2 Web/Servicios/Web.config
	BECA2 Web/Web/Web.csproj
	BECA2/UI/Pop up/pop_up_mensaje.Designer.vb
Merge remote-tracking branch 'origin/master' into esteban-lopez

Conflicts:
	BECA2 Web/BECA2.sln
	BECA2 Web/Servicios/Servicios.csproj
	BECA2 Web/Servicios/Web.config
	BECA2 Web/Web/Web.csproj
merge
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