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
modify the sql
app linechart
Merge pull request #396 from zengwei0771/master

app data collect
resolve conflicts
resolve conflicts
Merge pull request #397 from jialinsun/master

cat-agent 重构，app linechart
Merge branch 'master' of github.com:dianping/cat
refactor the code
Merge pull request #398 from youyong205/master

refactor
app data collect refactor