Merge pull request #1 from chengfangpeng/dev

Dev
Merge branch 'cfp' of https://github.com/chengfangpeng/cheng into xyj
2014年12月4日11:58:32
Merge branch 'xyj' into dev