agent重构
Merge branch 'master' of https://github.com/dianping/cat
Merge branch 'master' of https://github.com/dianping/cat
merge
resolve conflicts
resolve
merge
pull resolve conflicts
app linechart
resolve conflicts
resolve conflicts
Merge pull request #397 from jialinsun/master

cat-agent 重构，app linechart