web monitor refactor
Merge branch 'master' of https://github.com/jialinsun/cat; branch 'master' of https://github.com/dianping/cat
resolve conflicts
Merge branch 'master' of https://github.com/dianping/cat
modify jsp
modify jsp style
fix monitor batch bug
fix possible bug
Merge pull request #652 from jialinsun/master

web monitor refactor