modify the jsp
fix comfict
Merge pull request #441 from youyong205/master

refactor
Merge branch 'master' of https://github.com/dianping/cat
network monitor doc update