integrando para segunda iteracion
Merge remote-tracking branch 'origin/master'

Conflicts:
	BECA2/DAL/Repositories/CarreraRepository.cs
	BECA2/UI/App.config
	BECA2/UI/Frm_ModificarCarrera.Designer.vb
	BECA2/UI/Frm_ModificarCarrera.vb
	BECA2/UI/My Project/AssemblyInfo.vb
	BECA2/UI/UI.vbproj
	BECA2/UI/Uc_Carreras.vb