Merge remote-tracking branch 'upstream/master'
DB/Trigger: Fixed instance exit of the Culling of Stratholme
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
	src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp
	src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp
	src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp
Merge remote-tracking branch 'upstream/master'