app alert implementation
resolve conflicts
web alert implementation completed
resolve conflicts
support foreign hot cities ip
delete log
refactor inservice path
Merge pull request #505 from jialinsun/master

app\web alert , support hot foreign cities
Merge branch 'master' of github.com:dianping/cat
fix jsp page