Merge branch 'master' of https://github.com/TrinityCore/TrinityCore
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore
Merge branch 'master' of https://github.com/TrueWoW/TrinityCore into ghbb
DB/Creature: Remove Trigger Flags on Chaotic Rift

By dr-j, closes #11988
DB/Quest: Prepping the Speech

By untaught, closes #11348
[TW298] - Core/Scripts: ToCh - Clean up some variables at Paletress' script
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into ghbb
Merge branch 'master' of https://github.com/TrueWoW/TrinityCore into ghbb
[TW299] - Core/Scripts:  ToCh - Clean up spell difficulty definiations that already set at dbc
[TW300] - Core/Scripts: ToCh - Some changes here and there at Eadric
[TW301] - Core/Scripts: ToCh - More clean ups
Merge branch 'master' of https://github.com/TrueWoW/TrinityCore into ghbb
更新
更新
更新
Merge branch 'playerbot' of https://github.com/shenhuyong/TrinityCore into ghbb

Conflicts:
	src/server/game/AI/NpcBots/bot_ai.cpp
	src/server/game/AI/NpcBots/bot_ai.h
	src/server/game/AI/NpcBots/bot_death_knight_ai.cpp
	src/server/game/AI/NpcBots/bot_druid_ai.cpp
	src/server/game/AI/NpcBots/bot_hunter_ai.cpp
	src/server/game/AI/NpcBots/bot_paladin_ai.cpp
	src/server/game/AI/NpcBots/bot_priest_ai.cpp
	src/server/game/AI/NpcBots/bot_rogue_ai.cpp
	src/server/game/AI/NpcBots/bot_shaman_ai.cpp
	src/server/game/AI/NpcBots/botcommands.cpp
	src/server/game/AI/NpcBots/bothelper.cpp
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Globals/ObjectMgr.h
	src/server/game/Scripting/ScriptLoader.cpp
	src/server/worldserver/worldserver.conf.dist
Merge branch 'playerbot' of https://github.com/shenhuyong/TrinityCore into ghbb

Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Scripting/ScriptLoader.cpp
更新