Merge pull request #96 from youyong205/master

synchronize with biz branch
Merge pull request #174 from youyong205/master

Merge
Merge pull request #186 from youyong205/master

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

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

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

merge from biz
Fix typo in README
Merge pull request #226 from lidonghua/master

Fix typo in README
Merge branch 'master' of github.com:dianping/cat
modify the war name