plan de estudios
Merge remote-tracking branch 'origin/esteban-lopez' into paula

Conflicts:
	BECA2/BLL/GestorPlan.cs
	BECA2/EntitiesLayer/EntitiesLayer.csproj
	BECA2/EntitiesLayer/Plan.cs