modify the npe
modify the monitor api
fix the cat client bug
Merge branch 'master' of github.com:dianping/cat
modify the cdnfilter
modify the status
fix npe
modify the jsp
modify the jsp
modify the cdnfilter
Merge pull request #378 from youyong205/master

fix bug
reslove conflicts