Merge branch 'master' into zh-work
[zh_CN] done /zh/models/data-validation.rst and /zh/models/data-validation/validating-data-from-the-controller.rst
Merge pull request #1865 from mafeifan/zh

[zh_CN] done /zh/models/data-validation.rst and /zh/models/data-validation/validating-data-from-the-controller.rst
Changed public $_schema to protected

I haven't found a reason why this needs to be so.
Merge pull request #1869 from cakephp/_schema-protected

Changed public $_schema to protected
[zh_CN] done zh/models/deleting-data.rst
Merge pull request #1872 from mafeifan/zh

[zh_CN] done zh/models/deleting-data.rst
[fr] corrections
[zh_CN] fix reference error
Merge branch 'master' into zh-work

Conflicts:
	zh/models/data-validation.rst
	zh/models/data-validation/validating-data-from-the-controller.rst
	zh/models/deleting-data.rst
resolved!
Merge branch 'zh-work' into oschina