REPARANDO CONFLICTOS
Merge remote-tracking branch 'origin/marco-rodriguez'

Conflicts:
	BECA2/BLL/BLL.csproj
	BECA2/EntitiesLayer/EntitiesLayer.csproj
	BECA2/EntitiesLayer/IEntity.cs
	BECA2/UI/My Project/Application.Designer.vb
	BECA2/UI/My Project/Application.myapp
	BECA2/UI/UI.vbproj
Merge branch 'esteban-lopez'

Conflicts:
	BECA2/BLL/BLL.csproj
	BECA2/EntitiesLayer/EntitiesLayer.csproj
	BECA2/UI/My Project/Application.Designer.vb
	BECA2/UI/My Project/Application.myapp
	BECA2/UI/UI.vbproj
Acceso a BD_BECA2

Creacion de carrera
Merge remote-tracking branch 'origin/jorge.argds' into esteban-lopez

Reparando la rama master
Merge remote-tracking branch 'origin/marco-rodriguez'