BETA 6.0.2 Build 18950
Merge branch 'ptr' of github.com:aryu/WowInterface into ptr

Conflicts:
	AddOns/Blizzard_EncounterJournal/Blizzard_EncounterJournal.lua
	AddOns/Blizzard_PetJournal/Blizzard_PetJournal.lua
	FrameXML/ActionButton.lua
	FrameXML/ContainerFrame.xml
	GlueXML/CharacterServices.lua