Merge pull request #312 from youyong205/master

modify the broker-service pom
nettopo add discard,error data
修复异常告警bug，添加系统监控TAB以及系统监控的选项配置,网络监控文档完善
Merge branch 'master' of https://github.com/dianping/cat
clean some code
modify ugly code
Merge pull request #315 from jialinsun/master

修复异常告警bug，添加系统监控TAB以及系统监控的选项配置,网络监控文档完善
Merge pull request #314 from zengwei0771/master

nettopo add discard,error data
Merge branch 'master' of github.com:dianping/cat
romove blank