segunda iteracion
segunda iteracion
Merge remote-tracking branch 'origin/master' into jorge.argds

Conflicts:
	BECA2/BLL/GestorBeca.cs
	BECA2/BLL/GestorGeneral.cs
	BECA2/BLL/GestorUsuario.cs
	BECA2/Beca2Installer/Beca2Installer.vdproj
	BECA2/DAL/Bitacoras.cs
	BECA2/DAL/DAL.csproj
	BECA2/DAL/Repositories/CursoRepository.cs
	BECA2/DAL/Repositories/PermisoRepository.cs
	BECA2/DAL/Repositories/RolRepository.cs
	BECA2/EntitiesLayer/Beca.cs
	BECA2/EntitiesLayer/Beneficio.cs
	BECA2/EntitiesLayer/Carrera.cs
	BECA2/EntitiesLayer/Curso.cs
	BECA2/EntitiesLayer/Rol.cs
	BECA2/UI/App.config
	BECA2/UI/Frm_CrearBeneficio.vb
	BECA2/UI/Frm_CrearCarrera.vb
	BECA2/UI/Frm_CrearCurso.vb
	BECA2/UI/Frm_CrearRequisito.vb
	BECA2/UI/Frm_CrearRol.vb
	BECA2/UI/Frm_CrearTipoBeca.vb
	BECA2/UI/Frm_CrearUsuario.vb
	BECA2/UI/Frm_ModificarBeneficio.vb
	BECA2/UI/Frm_ModificarCarrera.vb
	BECA2/UI/Frm_ModificarCurso.vb
	BECA2/UI/Frm_ModificarRequisito.vb
	BECA2/UI/Frm_ModificarRol.vb
	BECA2/UI/Frm_ModificarTipoBeca.vb
	BECA2/UI/Frm_SeleccionarBeneficios.vb
	BECA2/UI/Frm_SeleccionarCarreras.vb
	BECA2/UI/Frm_SeleccionarRequisitos.vb
	BECA2/UI/UC_ConsultarBecas.vb
	BECA2/UI/UC_SeleccionarBeneficios.Designer.vb
	BECA2/UI/UC_SeleccionarBeneficios.vb
	BECA2/UI/UC_SeleccionarRequisitos.Designer.vb
	BECA2/UI/UC_SeleccionarRequisitos.vb
	BECA2/UI/Uc_Becas.vb
	BECA2/UI/Uc_Beneficios.vb
	BECA2/UI/Uc_Carreras.vb
	BECA2/UI/Uc_Cursos.Designer.vb
	BECA2/UI/Uc_Cursos.vb
	BECA2/UI/Uc_Requisitos.vb
	BECA2/UI/Uc_Roles.vb
	BECA2/UI/Uc_SeleccionarCarreras.vb
	BECA2/UI/Uc_TipoBeca.vb
	BECA2/UI/Uc_Usuarios.vb
Merge remote-tracking branch 'origin/master' into marco-rodriguez

Conflicts:
	BECA2/BLL/GestorBeca.cs
	BECA2/BLL/GestorGeneral.cs
	BECA2/BLL/GestorUsuario.cs
	BECA2/Beca2Installer/Beca2Installer.vdproj
	BECA2/DAL/Bitacoras.cs
	BECA2/DAL/DAL.csproj
	BECA2/DAL/Repositories/CursoRepository.cs
	BECA2/DAL/Repositories/PermisoRepository.cs
	BECA2/DAL/Repositories/RolRepository.cs
	BECA2/EntitiesLayer/Beca.cs
	BECA2/EntitiesLayer/Beneficio.cs
	BECA2/EntitiesLayer/Carrera.cs
	BECA2/EntitiesLayer/Curso.cs
	BECA2/EntitiesLayer/Rol.cs
	BECA2/UI/App.config
	BECA2/UI/Frm_CrearBeneficio.vb
	BECA2/UI/Frm_CrearCarrera.vb
	BECA2/UI/Frm_CrearCurso.vb
	BECA2/UI/Frm_CrearRequisito.vb
	BECA2/UI/Frm_CrearRol.vb
	BECA2/UI/Frm_CrearTipoBeca.vb
	BECA2/UI/Frm_CrearUsuario.vb
	BECA2/UI/Frm_ModificarBeneficio.vb
	BECA2/UI/Frm_ModificarCarrera.vb
	BECA2/UI/Frm_ModificarCurso.vb
	BECA2/UI/Frm_ModificarRequisito.vb
	BECA2/UI/Frm_ModificarRol.vb
	BECA2/UI/Frm_ModificarTipoBeca.vb
	BECA2/UI/Frm_SeleccionarBeneficios.vb
	BECA2/UI/Frm_SeleccionarCarreras.vb
	BECA2/UI/Frm_SeleccionarRequisitos.vb
	BECA2/UI/UC_ConsultarBecas.vb
	BECA2/UI/UC_SeleccionarBeneficios.Designer.vb
	BECA2/UI/UC_SeleccionarBeneficios.vb
	BECA2/UI/UC_SeleccionarRequisitos.Designer.vb
	BECA2/UI/UC_SeleccionarRequisitos.vb
	BECA2/UI/Uc_Becas.vb
	BECA2/UI/Uc_Beneficios.vb
	BECA2/UI/Uc_Carreras.vb
	BECA2/UI/Uc_Cursos.Designer.vb
	BECA2/UI/Uc_Cursos.vb
	BECA2/UI/Uc_Requisitos.vb
	BECA2/UI/Uc_Roles.vb
	BECA2/UI/Uc_SeleccionarCarreras.vb
	BECA2/UI/Uc_TipoBeca.vb
	BECA2/UI/Uc_Usuarios.vb
Merge remote-tracking branch 'origin/esteban-lopez' into jorge.argds
Merge remote-tracking branch 'origin/esteban-lopez' into marco-rodriguez
lsito
listo
listo
arreglos
Merge remote-tracking branch 'origin/esteban-lopez'
Commit marco

documentacion
Merge remote-tracking branch 'origin/marco-rodriguez'