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