Merge 3.3.5a to 4.3.4

Conflicts:
	EasyFunctions.h
	ShadeOfAkama.cpp
	algalon_the_observer.cpp
	Creatures.cpp
	Darkshore.cpp
	HellfirePeninsula.cpp
	HillsbradFoothills.cpp
	Misc.cpp
	Netherstorm.cpp
	Setup.cpp
	Setup.h
	TheHinterlands.cpp
	ThousandNeedles.cpp
	MiscSpells.cpp
	Misc.cpp