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

Conflicts:
	src/server/game/Entities/Player/Player.h
	src/server/scripts/Custom/Transmogrifier.cpp