Fixed stacking issues with SE_Limit* (ex. Unholy Aura Discipline and Aura of Reverence)
Merge pull request #37 from mackal/stacking_SE_Limits

Fixed stacking issues with SE_Limit* (ex. Unholy Aura Discipline and Aur...
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
Added some pointer checks as discussed in issue #36
Merge branch 'master' of https://github.com/EQEmu/Server

Conflicts:
	zone/client_packet.cpp
	zone/merc.cpp
	zone/npc.cpp