Merge pull request #618 from jialinsun/master

fix bug
Merge pull request #619 from youyong205/master

modify the server config manager
app code update jsp modify
Merge branch 'master' of https://github.com/dianping/cat
Merge pull request #620 from jialinsun/master

app code update jsp modify
modify the jsp