CORE: fixed rare cases of worms having their names turn green
CORE: very minor change to entity update packet
SQL: IDs for shinryu attacks
Merge pull request #357 from TeoTwawki/misc

Just some zone list updating to add the new zone names for what SE has added
CORE: updated merit packet - fixed the capped EXP color, added max_merit_points config to packet
Merge branch 'master' of https://github.com/DarkstarProject/darkstar
CORE: another small fix to merit packet