session
Merge branch 'master' of https://github.com/lgoldin/GestionDatos

Conflicts:
	Solucion/FrbaHotel/Index.Designer.cs
	Solucion/FrbaHotel/Index.cs
Merge branch 'master' of https://github.com/lgoldin/GestionDatos

Conflicts:
	Solucion/FrbaHotel.Entities/FrbaHotel.Entities.csproj
	Solucion/FrbaHotel/Index.Designer.cs
	Solucion/FrbaHotel/Index.cs