Merge pull request #50 from atellwu/master

将slave策略由hdsf改为local;	更新cat版本
cat 打点优化
merged & preservedDay change to 2
Merge pull request #51 from atellwu/master

修改dbServerId
Merge branch 'master' of https://github.com/dianping/puma
Merge pull request #52 from leoliang/master

cat打点优化