Merge branch 'master' into 3.0

Conflicts:
	en/appendices/2-5-migration-guide.rst
	en/console-and-shells.rst
	en/console-and-shells/code-generation-with-bake.rst
	en/contributing/code.rst
	en/controllers.rst
	en/core-libraries/behaviors/translate.rst
	en/core-libraries/caching.rst
	en/core-libraries/components/access-control-lists.rst
	en/core-libraries/components/authentication.rst
	en/core-libraries/components/security-component.rst
	en/core-libraries/helpers/form.rst
	en/core-libraries/helpers/js.rst
	en/core-libraries/logging.rst
	en/core-utility-libraries/app.rst
	en/core-utility-libraries/hash.rst
	en/core-utility-libraries/security.rst
	en/core-utility-libraries/string.rst
	en/deployment.rst
	en/development/debugging.rst
	en/development/testing.rst
	en/installation.rst
	en/installation/advanced-installation.rst
	en/models/data-validation.rst
	en/models/saving-your-data.rst
	en/models/transactions.rst
	en/plugins.rst
	en/tutorials-and-examples/blog-auth-example/auth.rst
	en/tutorials-and-examples/simple-acl-controlled-application/simple-acl-controlled-application.rst
	en/views.rst
	es/cakephp-overview/where-to-get-help.rst
	es/index.rst
	es/installation.rst
	es/tutorials-and-examples/blog/part-two.rst
	fr/appendices/2-5-migration-guide.rst
	fr/appendices/glossary.rst
	fr/cakephp-overview/understanding-model-view-controller.rst
	fr/cakephp-overview/where-to-get-help.rst
	fr/contributing/code.rst
	fr/core-libraries/components/authentication.rst
	fr/core-libraries/components/cookie.rst
	fr/core-libraries/components/security-component.rst
	fr/core-libraries/components/sessions.rst
	fr/core-libraries/global-constants-and-functions.rst
	fr/core-libraries/helpers/form.rst
	fr/core-libraries/helpers/html.rst
	fr/core-libraries/helpers/session.rst
	fr/core-libraries/helpers/text.rst
	fr/core-utility-libraries/security.rst
	fr/development/configuration.rst
	fr/development/debugging.rst
	fr/development/routing.rst
	fr/plugins.rst
	fr/tutorials-and-examples/simple-acl-controlled-application/simple-acl-controlled-application.rst