Fixed a couple of memory leaks.
Fixed zone crash due to merc focus effects & tribute, merc aggro issues when client in melee range, spell recast timers. Added melee DPS spells/disciplines & support.
Merge branch 'master' of https://github.com/EQEmu/Server into Mercs

Conflicts:
	changelog.txt
Changelog fix.