fix issue for citymanager
Merge branch 'master' of https://github.com/dianping/cat
add ipservice in broker-service
add ipservice in broker-service
modif config load path
Merge branch 'master' of https://github.com/jialinsun/cat
refactor ipservice
Merge pull request #506 from jialinsun/master

fix issue for citymanager
Merge branch 'master' of github.com:dianping/cat