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
remove unused code
add the servlet
modify jsp
refactor baseline service
modify jsp style
fix monitor batch bug
fix possible bug
Merge pull request #655 from leonindy/master

refactor heartbeat report, add database alert module
Merge pull request #652 from jialinsun/master

web monitor refactor
modify the default task consumer
revert
Merge pull request #656 from jialinsun/master

revert
modify the componts
Merge pull request #657 from youyong205/master

fix many bug
revert batch handle code
fix possible bug