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