cambio en el saldo de vacaciones
some changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	BusinessLogic/obj/Debug/BusinessLogic.csproj.FileListAbsolute.txt

	BusinessLogic/obj/Debug/BusinessLogic.csprojResolveAssemblyReference.cache
	SistemaHotelero.suo
	SistemaHotelero/bin/Debug/SistemaHotelero.exe
	SistemaHotelero/bin/Debug/SistemaHotelero.pdb

	SistemaHotelero/obj/x86/Debug/Presentation.csproj.GenerateResource.Cache
	SistemaHotelero/obj/x86/Debug/SistemaHotelero.exe
	SistemaHotelero/obj/x86/Debug/SistemaHotelero.pdb