cfbg
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into cfbg
Merge branch 'cfbg' of https://github.com/shenhuyong/TrinityCore into ghbb

Conflicts:
	src/server/worldserver/worldserver.conf.dist