Merge remote-tracking branch 'origin/master' into esteban-lopez

Conflicts:
	BECA2/UI/App.config

merge

Merge remote-tracking branch 'origin/master' into
esteban-lopez

Conflicts:
	BECA2/UI/App.config
	BECA2/UI/My
Project/Application.myapp
	BECA2/UI/My
Project/Settings.Designer.vb
	BECA2/UI/My
Project/Settings.settings
	BECA2/UI/UI.vbproj

reporte

proforma

reporte

merge
Merge remote-tracking branch 'origin/master' into esteban-lopez

Conflicts:
	BECA2/BLL/GestorUsuario.cs
	BECA2/DAL/Utility/UtilidadesUsuario.cs
	BECA2/UI/App.config
	BECA2/UI/Frm_Principal.Designer.vb
	BECA2/UI/My Project/Application.myapp
	BECA2/UI/Uc_SeleccionarCarreras.vb
arreglando
listo
Commit 06/11/2014

Cambios generales y reporte de proforma
Documentación
Merge remote-tracking branch 'origin/marco-rodriguez'

Conflicts:
	BECA2/UI/App.config
	BECA2/UI/Frm_CrearCarrera.vb
Merge remote-tracking branch 'origin/jorge.argds'
Merge remote-tracking branch 'origin/esteban-lopez'

Conflicts:
	BECA2/BLL/GestorUsuario.cs
	BECA2/UI/My Project/Application.myapp
	BECA2/UI/UI.vbproj
Merge integracion