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

Conflicts:
	src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp
Merge branch 'master' of https://github.com/flippy84/TrinityCore

Conflicts:
	src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp