merge
Cambios

Se realizaron cambios en el menu y el cerrar sesion.
Paula

Parte paula
Merge remote-tracking branch 'origin/paula'

Conflicts:
	BECA2/DAL/Repositories/TipoBecaRepository.cs
	BECA2/DAL/UnitOfWork.cs
	BECA2/UI/Frm_ConsultarBeca.designer.vb
	BECA2/UI/Frm_ConsultarBeca.vb
	BECA2/UI/Frm_Princiapal.vb
	BECA2/UI/ModuloGlobal.vb
	BECA2/UI/Pop up/pop_up_mensaje.vb
	BECA2/UI/UI.vbproj
	BECA2/UI/Uc_Becas.vb
Merge remote-tracking branch 'origin/jorge.argds'
Merge remote-tracking branch 'origin/master' into jorge.argds
arreglando merge paula, jorge
Merge remote-tracking branch 'origin/master' into jorge.argds
commit ultimos cambios

Depuracion del menu y registro de accion
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
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
listo el merge
a

a
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