Merge Disaster part 2

How did the resources get left out??? And how was UIExitDialog back at
its several month old version?