app linechart 重构
Merge branch 'master' of https://github.com/dianping/cat
fix bug
Merge pull request #403 from youyong205/master

fix bug
Merge pull request #402 from jialinsun/master

app linechart 重构
merge conflict fix