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