laksdda
Merge
Conflicts:
	BECA2/DAL/Repositories/UsuarioRepository.cs
	BECA2/UI/My Project/Application.Designer.vb
	BECA2/UI/My Project/Application.myapp
	BECA2/UI/UI.vbproj
Arreglando
Arreglando
Arreglando
Merge branch 'Wen' of https://github.com/KOIP2/AplicacionBeca2-KOI into Wen

Conflicts:
	BECA2.rar
	BECA2/BLL/GestorBeca.cs
	BECA2/BLL/GestorCarrera.cs
	BECA2/BLL/GestorGeneral.cs
	BECA2/BLL/GestorUsuario.cs
	BECA2/DAL/IniciarSesion.cs
	BECA2/DAL/Repositories/BecaRepository.cs
	BECA2/DAL/Repositories/TipoBecaRepository.cs
	BECA2/DAL/Repositories/UsuarioRepository.cs
	BECA2/DAL/UnitOfWork.cs
	BECA2/DAL/Utility/IUtility.cs
	BECA2/DAL/Utility/UtilidadesRol.cs
	BECA2/DAL/Utility/UtilidadesTipoBeca.cs
	BECA2/DAL/Utility/UtilidadesUsuario.cs
	BECA2/EntitiesLayer/Beca.cs
	BECA2/EntitiesLayer/Usuario.cs
	BECA2/UI/App.config
	BECA2/UI/Frm_CambiarContrasenia.resx
	BECA2/UI/Frm_CrearBeneficio.vb
	BECA2/UI/Frm_CrearCarrera.vb
	BECA2/UI/Frm_CrearUsuario.Designer.vb
	BECA2/UI/Frm_CrearUsuario.vb
	BECA2/UI/Frm_InicioDeSesion.resx
	BECA2/UI/Frm_ModificarBeneficio.vb
	BECA2/UI/Frm_MostrarCurso.Designer.vb
	BECA2/UI/Frm_Principal.Designer.vb
	BECA2/UI/Frm_Principal.resx
	BECA2/UI/Frm_Principal.vb
	BECA2/UI/Frm_SeleccionarCarreras.vb
	BECA2/UI/My Project/Resources.resx
	BECA2/UI/UC_ConsultarBecas.Designer.vb
	BECA2/UI/UC_ConsultarBecas.vb
	BECA2/UI/UC_SeleccionarBeneficios.vb
	BECA2/UI/UC_SeleccionarRequisitos.vb
	BECA2/UI/UI.vbproj
	BECA2/UI/Uc_Becas.vb
	BECA2/UI/Uc_CambiarContrasenna.vb
	BECA2/UI/Uc_Perfil.Designer.vb
	BECA2/UI/Uc_Principal.Designer.vb
	BECA2/UI/Uc_SeleccionarCarreras.vb