Merge master into 4.3.4

Conflicts:
	DBCStores.h
	HackFixes.cpp
	Player.cpp
	Player.h
	Spell.h
Change maxbuild to 15595

Gotta change some other stuff for this