更新
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into playerbot

Conflicts:
	src/server/game/Server/WorldSession.h
更新
Merge branch 'playerbot' of https://github.com/shenhuyong/TrinityCore into ghbb

Conflicts:
	src/server/game/AI/NpcBots/bot_shaman_ai.cpp
	src/server/game/AI/NpcBots/botgiver.cpp