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
modify the cat log
modify the cat log
fix the tcpsocket
Merge branch 'biz' of github.com:dianping/cat into biz
modify the maven plugin version
modify the codegen version
modify the releasenote
modify the mvn codegen version
modify the home jsp
modify the meta data
modify the cat problem
Merge branch 'biz' of github.com:dianping/cat into biz