Merge pull request #242 from youyong205/master

merge from biz
Merge pull request #244 from dianping/biz

Biz
Merge pull request #248 from youyong205/master

merge from biz
Merge pull request #253 from youyong205/master

merge from biz
pull request test
Merge pull request #255 from youyong205/master

biz
Merge pull request #261 from youyong205/biz

Biz
Merge pull request #262 from youyong205/master

Biz
add the alert config
modify the test
modify the alertconfig
modify the cat metric alert
modify the send email
modify the cat alert config
fix the event graph problem
modify the cat email send error
fix event bug
Merge branch 'master' of https://github.com/dianping/cat
Create netcat.c
u