cambios del manifest

some changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	SistemaHotelero.suo
	SistemaHotelero/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache

	SistemaHotelero/obj/x86/Debug/TempPE/Properties.Resources.Designer.cs.dll