Fix Spell Dk
up
Merge branch 'master' of https://github.com/PaulHellCore/Core-Trinity

Conflicts:
	src/server/game/Scripting/ScriptLoader.cpp
	src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp