resolve conflicts
Merge branch 'master' of https://github.com/dianping/cat
异常阈值和异常过滤放到tab中进行区分
Merge pull request #320 from jialinsun/master

异常阈值和异常过滤放到tab中进行区分
fix jsp config
merge from code