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

Conflicts:
	src/server/game/World/World.cpp