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.
Slight fixes to upgrade logic - If you ran updates manually yourself, and you don't have a local version that matches the binary version yet. It will go through and get you up to date.
Manifest changes - Removed AA 'Required' updates. We will soon have an option to pull them down from PEQ in the prompt menu
Upload of peq_aa_tables.sql for db management interface
Fix for GetTradeRecipe results variable overload instead of reuse
PEQ AA Download option 4 implemented - http://i.imgur.com/OBrIOCM.png
Merge pull request #295 from Leere/getrecipefix

Fix for GetTradeRecipe results variable overload instead of reuse
Add see invis check to tracking packet
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.
luabind now compiles with warnings disabled for this library
warning from library file SocketLib\Mime.cpp disabled
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.