Resolve merge conflicts across multiple components
Merge and synchronize XML locale changes
Ensure consistency between string resources and localization files
Minor fixes to restore successful builds after merge
* Adjusted Exit Game title
Replaced "Return to Xbox Dashboard" with "Exit Minecraft" on the exit game screen.
* Fixed Blending on Intro Sequence
Fixed Blocky, Crappy blending on the ESRB and Mojang Logos in the Intro Sequence.
Acacia and Dark Oak Logs, Planks and Stairs.
Fences, Fence Gates and Doors for Spruce/Birch/Jungle/Acacia/Dark Oak.
Iron Trapdoors and Inverted Daylight Sensor.