Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into Transmogrification

Conflicts:
	src/server/game/Entities/Player/Player.h
更新
Merge branch 'Transmogrification' of https://github.com/shenhuyong/TrinityCore into ghbb

Conflicts:
	src/server/game/Entities/Player/Player.h
	src/server/scripts/Custom/Transmog/Transmogrification.cpp
	src/server/scripts/Custom/Transmog/Transmogrification.h
	src/server/scripts/Custom/Transmog/Transmogrifier.cpp
	src/server/worldserver/worldserver.conf.dist