Fixed Merc duplicate save bug, focus items, spell_scale and heal_scale now work implemented, new merc equipment (with focus items), added checks during merc hire, unsuspend, & timer update for states where a merc can't be hired, unsuspended, or can't be retained due to insufficient funds, no room in group, in raid, invalid merc data, etc, and give appropriate feedback, added rules for charging of merc purchase and upkeep costs.
Undo MAG pet targeting change
Merge branch 'master' of git://github.com/EQEmu/Server
Oops, it's not a leap year.
Merge pull request #21 from af4t/master

Undo MAG pet targeting change.
Tests fix + fix for certain factions not loading
Merge branch 'master' of https://github.com/EQEmu/Server