Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into cfbg

Conflicts:
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Battlegrounds/BattlegroundQueue.cpp
	src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/World/World.cpp
Merge branch 'cfbg' of https://github.com/shenhuyong/TrinityCore into ghbb

Conflicts:
	src/server/game/Battlegrounds/BattlegroundQueue.cpp
	src/server/game/Entities/Player/Player.cpp