refactor code
Merge branch 'master' of github.com:dianping/cat
modify the test
Merge pull request #338 from youyong205/master

refactor
modify the testcase
Merge pull request #339 from youyong205/master

modify the testcase
modify the jsp
Merge pull request #341 from youyong205/master

modify the jsp
Merge pull request #340 from jialinsun/master

由于nginx还未确定制定，引入Null 的bug
remove network info from business rules, refactor AlertConfigManager
merge newest code
modify the code
Merge pull request #342 from leonindy/master

remove network info from business rules, refactor AlertConfigManager
Merge branch 'master' of github.com:dianping/cat
modify the config
Merge pull request #343 from youyong205/master

fix bug
remove default rule, which will be done in code
change to SubCondition, change type of text in SubCondition
change subcondition to sub-condition for all configure file
modify the exception info