cambios en general
cambio
Merge remote-tracking branch 'origin/master'

Conflicts:
	BusinessLogic/obj/Debug/BusinessLogic.pdb
	DataBaseAccess/bin/Debug/BusinessLogic.dll
	DataBaseAccess/bin/Debug/BusinessLogic.pdb
	DataBaseAccess/bin/Debug/DataBaseAccess.dll
	DataBaseAccess/bin/Debug/DataBaseAccess.pdb

	DataBaseAccess/obj/Debug/DataBaseAccess.csprojResolveAssemblyReference.cache
	SistemaHotelero/MenuPrincipal.cs
	SistemaHotelero/Seguridad/AdministracionUsuarios.cs