commit ultimos cambios

consultar historiales
Merge remote-tracking branch 'origin/marco-rodriguez'

Conflicts:
	BECA2/UI/App.config
	BECA2/UI/Frm_Carreras.vb
	BECA2/UI/Frm_Principal.Designer.vb
	BECA2/UI/Frm_Principal.resx
	BECA2/UI/UI.vbproj
	BECA2/UI/Uc_Carreras.Designer.vb