cambios Jorge

cambios Jorge
Commit 06/11/2014

Cambios generales y reporte de proforma
integrado
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