agent重构
Merge branch 'master' of https://github.com/dianping/cat
Merge branch 'master' of https://github.com/dianping/cat
merge
resolve conflicts
app data collect
Merge branch 'master' of https://github.com/dianping/cat
Merge pull request #394 from youyong205/master

modify the app config
resolve
merge
Merge pull request #395 from youyong205/master

merge
pull resolve conflicts
app data
app data collect
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