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

Conflicts:
	src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_chrono_lord_epoch.cpp
	src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp
	src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp
	src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp
	src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp
	src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp
	src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp
	src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
	src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp
	src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp
	src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
	src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
	src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h
	src/server/scripts/Spells/spell_generic.cpp
	src/server/scripts/Spells/spell_quest.cpp
	src/server/scripts/World/go_scripts.cpp
Fix build...i think...let's see what's broken now from the previous conflicts...
Scripts/Onyxia Lair: Some small improvements to GUID storage as it's only used locally
Scripts/Onyxia Lair: Slight change so we don't call Reset() in the 'ctor
Merge branch 'master' of https://github.com/TrueWoW/TrinityCore into ghbb

Conflicts:
	src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_chrono_lord_epoch.cpp
	src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp
	src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp
	src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp
	src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp
	src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp
	src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
	src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp
	src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp
	src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
	src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h
	src/server/scripts/Spells/spell_generic.cpp
	src/server/scripts/Spells/spell_quest.cpp
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into ghbb

Conflicts:
	src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp