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

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