modify the sql
fix dailyreport
change build default rule logic
remove error
add config modification record feature
Merge branch 'master' of https://github.com/dianping/cat into HEAD
trigger git push
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
resolve conflicts