Merge git://github.com/EQEmu/Server into Development
Merge pull request #292 from KayenEQ/Development

Updated swarm pet AI to be consistent with live.
Fixed bad formatting of client.h and merc.h caused by my last commit.
Fixed merge
Added special ability functions to perl, removed some of the less used commands (and a few duplicates)
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.
Fix RoF Raid opcodes
revert
Merge git://github.com/EQEmu/Server into Development