Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into npcbot-temp

Conflicts:
	src/server/game/Entities/Player/Player.cpp
Merge branch 'npcbot-temp' of https://github.com/shenhuyong/TrinityCore into npcbot-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_druid_ai.cpp
	src/server/game/AI/NpcBots/bot_priest_ai.cpp
	src/server/game/AI/NpcBots/bot_shaman_ai.cpp
	src/server/game/AI/NpcBots/botcommands.cpp
	src/server/game/Entities/Creature/Creature.cpp