Merge remote-tracking branch 'origin/master' into jorge.argds
Merge remote-tracking branch 'origin/master' into jorge.argds
commit ultimos cambios

Depuracion del menu y registro de accion
Merge remote-tracking branch 'origin/jorge.argds'

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