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
change apis
stage changes
stage changes
add postman, alertmanater
add postman and alert manager to ExceptionAlert
Merge branch 'develop'
Merge remote-tracking branch 'origin/master' into codereview
resolve conflicts
Merge pull request #412 from leonindy/master

refactor alert module