Merge pull request #505 from jialinsun/master

app\web alert , support hot foreign cities
Merge branch 'master' of https://github.com/dianping/cat
add ipservice in broker-service