modify teh config
加入短信告警配置
Merge branch 'master' of https://github.com/dianping/cat
resolve conflicts
添加两个convertor方法的test case，修改了系统监控cmdbdomain没有时的空白显示bug，其他代码clean
add test resources
Merge pull request #346 from zengwei0771/master

net topo alert, warm config
Merge branch 'master' of github.com:dianping/cat
modify the netgraph
modify the nottopology
add the cdn api
modify the user monitor jsp
modify the default url
fix display error
完善网络监控展示方式，分离MetricConfig
Merge branch 'master' of https://github.com/dianping/cat
Merge pull request #347 from jialinsun/master

代码修改，详情请见commit log
Merge branch 'master' of github.com:dianping/cat
modify the test
Merge pull request #348 from youyong205/master

merge exception function