Manual merge of TargetRing pull request #286.
Merge git://github.com/EQEmu/Server into Development

Conflicts:
	changelog.txt
	common/eq_packet_structs.h
	common/patches/underfoot_structs.h
	common/spdat.h
	zone/effects.cpp
	zone/mob.cpp
	zone/spells.cpp