temp
temp
Merge branch 'npcbot-temp' 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_mage_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/bot_warlock_ai.cpp
	src/server/game/AI/NpcBots/bot_warrior_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/Globals/ObjectMgr.cpp
	src/server/game/Globals/ObjectMgr.h
	src/server/game/Handlers/MiscHandler.cpp
	src/server/game/Handlers/NPCHandler.cpp
	src/server/game/Scripting/ScriptLoader.cpp
	src/server/worldserver/worldserver.conf.dist