Fixed merc buffing bugs, added checks before dismissing merc to prevent possible bugged mercs, merged in Secret's merc memory leak fixes.
Merge branch 'master' of https://github.com/EQEmu/Server

Conflicts:
	changelog.txt