modify the sql
fix dailyreport
app alert implementation
resolve conflicts
remove error
Merge pull request #502 from leonindy/master

add record config modification feature,  fix business alert type bug
Merge branch 'master' of github.com:dianping/cat
Merge pull request #503 from youyong205/master

modify the error msg
modify the detail
Merge branch 'master' of github.com:dianping/cat
Merge pull request #504 from youyong205/master

modify the sql
web alert implementation completed
resolve conflicts
support foreign hot cities ip
delete log
refactor inservice path
fix the transaction conut problem
modify the test case
fix router config query bug
fix report router bug