[mr2160] move WorldPvP to mainstreem naming set. now I'm sure that the MT nothing better to do ...
[12097] Add Outdoor PvP placeholders and string texts

Conflicts:
	src/game/CMakeLists.txt
	src/game/Language.h
	src/game/OutdoorPvP/OutdoorPvP.cpp
	src/game/OutdoorPvP/OutdoorPvP.h
	src/game/OutdoorPvP/OutdoorPvPEP.cpp
	src/game/OutdoorPvP/OutdoorPvPEP.h
	src/game/OutdoorPvP/OutdoorPvPGH.cpp
	src/game/OutdoorPvP/OutdoorPvPGH.h
	src/game/OutdoorPvP/OutdoorPvPHP.cpp
	src/game/OutdoorPvP/OutdoorPvPHP.h
	src/game/OutdoorPvP/OutdoorPvPMgr.cpp
	src/game/OutdoorPvP/OutdoorPvPMgr.h
	src/game/OutdoorPvP/OutdoorPvPNA.cpp
	src/game/OutdoorPvP/OutdoorPvPNA.h
	src/game/OutdoorPvP/OutdoorPvPSI.cpp
	src/game/OutdoorPvP/OutdoorPvPSI.h
	src/game/OutdoorPvP/OutdoorPvPTF.cpp
	src/game/OutdoorPvP/OutdoorPvPTF.h
	src/game/OutdoorPvP/OutdoorPvPZM.cpp
	src/game/OutdoorPvP/OutdoorPvPZM.h
	win/VC100/game.vcxproj
	win/VC100/game.vcxproj.filters
Add OutdoorPvP class

Conflicts:
	src/game/OutdoorPvP/OutdoorPvP.cpp
	src/game/OutdoorPvP/OutdoorPvP.h
[12098] Add OutdoorPvPMgr class

Conflicts:
	src/game/OutdoorPvP/OutdoorPvPMgr.cpp
	src/game/OutdoorPvP/OutdoorPvPMgr.h
Use OutdoorPvPMgr to save/load capture point data when grid unloads

Conflicts:
	src/game/GameObject.cpp
Add Outdoor PvP handlers to various files

Conflicts:
	src/game/Creature.cpp
	src/game/GameObject.cpp
	src/game/MiscHandler.cpp
	src/game/Player.cpp
	src/game/SpellAuras.cpp
	src/game/Unit.cpp
Implement Silithus Outdoor PvP script

Conflicts:
	src/game/OutdoorPvP/OutdoorPvPSI.cpp
	src/game/OutdoorPvP/OutdoorPvPSI.h
Implement Eastern Plaguelands Outdoor PvP script

Conflicts:
	src/game/OutdoorPvP/OutdoorPvPEP.cpp
	src/game/OutdoorPvP/OutdoorPvPEP.h
Implement Hellfire Peninsula Outdoor PvP script

Conflicts:
	src/game/OutdoorPvP/OutdoorPvPHP.cpp
	src/game/OutdoorPvP/OutdoorPvPHP.h
Implement Zangarmarsh Outdoor PvP script

Conflicts:
	src/game/OutdoorPvP/OutdoorPvPZM.cpp
	src/game/OutdoorPvP/OutdoorPvPZM.h
Implement Terokkar Forest Outdoor PvP script

Conflicts:
	src/game/OutdoorPvP/OutdoorPvPTF.cpp
	src/game/OutdoorPvP/OutdoorPvPTF.h
Implement Nagrand - Halaa Outdoor PvP script

Conflicts:
	src/game/OutdoorPvP/OutdoorPvPNA.cpp
	src/game/OutdoorPvP/OutdoorPvPNA.h
Implement Grizzly Hills - Venture Bay Outdoor PvP script

Conflicts:
	src/game/OutdoorPvP/OutdoorPvPGH.cpp
	src/game/OutdoorPvP/OutdoorPvPGH.h
[12100] Finalize Outdoor PvP Implementation

Implementation by Xfurry and stfx

Thanks to all original Outdoor PvP authors - especially Balrok
Thanks to X-Savior for the proper data
Thanks to crackm for help with database

And thanks to all people who contributed and/or posted bug reports

Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>

Conflicts:
	src/game/World.cpp
	src/shared/revision_nr.h
[mr2161] fix OutdoorPvP after last merge
[12101] Implement spell 36677

Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
[12102] Implement ACTION_T_CHANCED_TEXT

This action allows to display a text with a chance.
The Chance must be provided in param1, text(s) can be provided in param2, optionally param3

Conflicts:
	src/game/CreatureEventAI.cpp
	src/game/CreatureEventAIMgr.cpp
SD2 update
Merge branch 'master' into testing
use SmartPointers to give access to VehikleKit. must solve some problems with vehicles. related to #1116
(update for SD2 provided in https://gist.github.com/3386851 currently)