Merge branch 'master' of github.com:dianping/cat
Merge pull request #703 from leonindy/master

merge newest code which can solve test failures
Merge pull request #704 from jialinsun/master

much fix
modify the config tag
modify the jsp
modify the jsp
modify the jsp
modify the logo
modify the logo page
modify the jsp
Merge pull request #705 from youyong205/master

modify the jsp
modify the md
modify the doc
modify the md
modify the md
modify the logo
Merge pull request #706 from youyong205/master

modify the md
modify the md
modify the md
Merge pull request #707 from youyong205/master

refactor md