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

Conflicts:
	Solucion/FrbaHotel/Index.Designer.cs