Merge git://github.com/EQEmu/Server into Development
Merge git://github.com/EQEmu/Server into Development
Fix to allow discipline reuse timers to be set on client correclty
and therefore have the client return the time remaining instead
of the server.

Hopefully may resolve some bugs reselated to discipline use.
Mercenaries now Dismiss, Suspend, Unsuspend, and Die correctly.
Merge branch 'master' of https://github.com/EQEmu/Server
Mercenaries now Dismiss, Suspend, Unsuspend, and Die correctly.
Minor Merc Correction.
Fix RoF Raid opcodes
revert
Merge git://github.com/EQEmu/Server into Development
Fix to remove double CastSpell calls from use disc function.
Merge pull request #299 from KayenEQ/Development

Fix to remove double CastSpell call from use disc function.
Fix issue with PendingTranslocateData
Grouping with Mercenaries is considerably less buggy.
Merge branch 'master' of https://github.com/EQEmu/Server
Lua parser: script_init.lua for zones will now follow script_init_v[0-9]+\.lua similar to player quests.
Crash fix for Swarm Pets.
Merge git://github.com/EQEmu/Server into Custom

Conflicts:
	zone/effects.cpp