更新
Merge branch 'ghbb2' of https://github.com/shenhuyong/TrinityCore into ghbb