SCRIPTS: shift conquest npcids for yhoator
SCRIPTS: remove check on WHM(why?) from siren's tear npc
Merge pull request #229 from maxtherabbit/siren

SCRIPTS: remove check on WHM(why?) from siren's tear npc
Merge pull request #227 from maxtherabbit/yhoat

SCRIPTS: shift conquest npcids for yhoator
CORE: update 0x0AC (CCharAbilitiesPacket) for 05/14/2014 update
Merge branch 'master' of https://github.com/DarkstarProject/darkstar
Merge commit 'a1d637844580688248b6ffbccc906a7daf738562' into Altalus-PrivateServer
Merge remote-tracking branch 'origin/Altalus-PrivateServer' into Altalus-PrivateServer