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