move AlertSummaryStringDecorator to test
Merge branch 'master' of https://github.com/dianping/cat
add new model: AlertType
Merge branch 'master' of https://github.com/dianping/cat into develop
add alert type page and manager
ignore xdd files
before pull
Merge branch 'master' of https://github.com/dianping/cat
change apis
stage changes
stage changes
Merge pull request #409 from youyong205/master

fix many bug
add postman, alertmanater
commit before pull
delete comment
resolve conflicts
Merge pull request #411 from youyong205/master

fix test bug
Merge branch 'master' of https://github.com/dianping/cat
rebuild
Merge pull request #410 from jialinsun/master

第三方监控