reslove conflicts
resolve conflicts
Merge branch 'master' of https://github.com/dianping/cat
reslove conflicts
Merge branch 'master' of https://github.com/dianping/cat
Merge pull request #427 from youyong205/master

fix router bug
Merge branch 'master' of https://github.com/dianping/cat
Merge pull request #428 from youyong205/master

fix the default config
Merge branch 'master' of https://github.com/dianping/cat
js monitor alert
modify mail content
delete log
cleann
fix app linechart bug
fix bug
fix cat-agent  bug of runing process open too many files
delete check write false sys out log
thirdparty monitor doc
Merge pull request #429 from jialinsun/master

js exception alert, modify system monitor,
Merge branch 'master' of github.com:dianping/cat