Small changes to encounter stuff
Merge branch 'master' of github.com:EQEmu/Server
Fix to SE_PercentHeal to allow it to work if no max value set.
Merge pull request #281 from KayenEQ/Development

Fix to SE_PercentHeal to allow it to work if no max value set.
Fix for CalcMaxHP
Tracking default order should now be correct

Reworked the tracking packet creation, should be better
Merge pull request #282 from KayenEQ/Development

Fix for CalcMaxHP
Fixed dynamic merchant list loading.  Allows any merchant to be used in any zone.
Mez spells will no longer attempt memblur each tic, just on initial cast.
reverted change to calcmaxhp due to potential overflow issues.
Merge pull request #283 from KayenEQ/Development

Mez spells will no longer attempt memblur each tic, just on initial cast...
Merge branch 'master' of github.com:EQEmu/Server
Added transactions for corpse creation, added sql to fix a bug in raid member saving in some situations, fixed a bug in encounters
Missed the actual sql
Implement RoF + UF ornament augmentation.. thanks for the help Drajor!
fix for copy paste error that linux didnt like
Indentation fix. Ornamentation Augments are integrated now.
Merge branch 'master' of https://github.com/EQEmu/Server
Merge git://github.com/EQEmu/Server into Custom

Conflicts:
	zone/mob.cpp
Merge git://github.com/EQEmu/Server into Custom
C! Pre merge