Merge pull request #1779 from blackpuppy/zh

[en] corrent origianl text: Cake application -> CakePHP application
Merge branch 'zh' into zh-work
Merge branch 'zh-work' into oschina