reslove conflicts
resolve conflicts
Merge branch 'master' of https://github.com/dianping/cat
Merge pull request #426 from leonindy/master

use ftl as alert template, add argument to receiver method
refactor channel code
Merge branch 'master' of github.com:dianping/cat
modify the default-alert-policy
modify the business alert
fix the check time
modify the compile error
fix channel manager
reslove conflicts
Merge branch 'master' of https://github.com/dianping/cat
modify the router jsp
fix bug
modify the api
modify the channel manager
Merge pull request #427 from youyong205/master

fix router bug
Merge branch 'master' of https://github.com/dianping/cat
fix the default config