Merge pull request #677 from leonindy/master

add disk and extension infos for heartbeat history module
fix the client too many child bug
modify the msg size
modify the jsp
refactor
Merge pull request #678 from youyong205/master

modify the jsp
resolve conflicts
fix bug
clean code
change hadoop version
modify the npe
fix bug
revert
modify test case
Merge pull request #679 from jialinsun/master

fix bug
merge code
fix monitor api bug
fix bug
Merge branch 'master' of https://github.com/dianping/cat
Merge pull request #680 from jialinsun/master

fix bug