Merge pull request #542 from youyong205/master

delete unused xml
fix serval bugs
merge new code
modify heart beat default rule
Merge pull request #543 from leonindy/master

fix serval bugs
Merge branch 'master' of github.com:dianping/cat
remove unused code