[TW296] - Updating OVERRIDE to override in custom scripts.
[TW297] - More OVERRIDE/override changes and UpdateEntry changes in custom scripts.
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore
Merge branch 'master' of https://github.com/TrueWoW/TrinityCore into ghbb

Conflicts:
	src/server/scripts/Custom/TrialOfTheCrusader/TW_boss_faction_champions.cpp
	src/server/scripts/Custom/Ulduar/TW_boss_mimiron.cpp
	src/server/scripts/Custom/Ulduar/TW_boss_thorim.cpp
	src/server/scripts/Custom/WorldEvents/TW_boss_apothecary_trio.cpp
	src/server/scripts/Custom/WorldEvents/TW_hallows_end.cpp
	src/server/scripts/Custom/WorldEvents/TW_pilgrim.cpp
	src/server/scripts/Custom/WorldEvents/brewfest.cpp
	src/server/scripts/Custom/cs_custom.cpp
	src/server/scripts/Custom/custom_scripts.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp