Merge branch 'master' into 3.0-master-merge

Conflicts:
	config/all.py
	en/appendices.rst
	en/appendices/2-0-migration-guide.rst
	en/appendices/2-2-migration-guide.rst
	en/appendices/2-3-migration-guide.rst
	en/appendices/2-4-migration-guide.rst
	en/appendices/2-5-migration-guide.rst
	en/appendices/glossary.rst
	en/appendices/migrating-from-cakephp-1-2-to-1-3.rst
	en/appendices/new-features-in-cakephp-1-3.rst
	en/appendices/new-features-in-cakephp-2-0.rst
	en/appendices/new-features-in-cakephp-2-1.rst
	en/appendices/phpunit-migration-hints.rst
	en/cakephp-overview/what-is-cakephp-why-use-it.rst
	en/console-and-shells.rst
	en/console-and-shells/acl-shell.rst
	en/console-and-shells/code-generation-with-bake.rst
	en/console-and-shells/schema-management-and-migrations.rst
	en/contributing/cakephp-coding-conventions.rst
	en/contributing/documentation.rst
	en/controllers.rst
	en/controllers/components.rst
	en/controllers/request-response.rst
	en/controllers/scaffolding.rst
	en/core-libraries/behaviors/containable.rst
	en/core-libraries/behaviors/translate.rst
	en/core-libraries/behaviors/tree.rst
	en/core-libraries/collections.rst
	en/core-libraries/components/access-control-lists.rst
	en/core-libraries/components/authentication.rst
	en/core-libraries/components/cookie.rst
	en/core-libraries/components/email.rst
	en/core-libraries/components/pagination.rst
	en/core-libraries/components/security-component.rst
	en/core-libraries/components/sessions.rst
	en/core-libraries/events.rst
	en/core-libraries/helpers/form.rst
	en/core-libraries/helpers/html.rst
	en/core-libraries/helpers/js.rst
	en/core-libraries/helpers/paginator.rst
	en/core-libraries/helpers/rss.rst
	en/core-libraries/helpers/session.rst
	en/core-libraries/logging.rst
	en/core-libraries/toc-helpers.rst
	en/core-utility-libraries/app.rst
	en/core-utility-libraries/email.rst
	en/core-utility-libraries/file-folder.rst
	en/core-utility-libraries/httpsocket.rst
	en/core-utility-libraries/security.rst
	en/core-utility-libraries/time.rst
	en/deployment.rst
	en/development/configuration.rst
	en/development/debugging.rst
	en/development/errors.rst
	en/development/exceptions.rst
	en/development/routing.rst
	en/development/testing.rst
	en/getting-started/cakephp-conventions.rst
	en/getting-started/cakephp-folder-structure.rst
	en/index.rst
	en/installation.rst
	en/installation/advanced-installation.rst
	en/installation/url-rewriting.rst
	en/models.rst
	en/models/additional-methods-and-properties.rst
	en/models/associations-linking-models-together.rst
	en/models/behaviors.rst
	en/models/callback-methods.rst
	en/models/data-validation.rst
	en/models/data-validation/validating-data-from-the-controller.rst
	en/models/datasources.rst
	en/models/deleting-data.rst
	en/models/model-attributes.rst
	en/models/retrieving-your-data.rst
	en/models/saving-your-data.rst
	en/models/virtual-fields.rst
	en/plugins.rst
	en/tutorials-and-examples/blog-auth-example/auth.rst
	en/tutorials-and-examples/blog/blog.rst
	en/tutorials-and-examples/blog/part-two.rst
	en/views.rst
	en/views/media-view.rst
	en/views/themes.rst
	fr/appendices.rst
	fr/appendices/2-0-migration-guide.rst
	fr/appendices/2-3-migration-guide.rst
	fr/appendices/2-4-migration-guide.rst
	fr/appendices/glossary.rst
	fr/appendices/new-features-in-cakephp-2-0.rst
	fr/appendices/new-features-in-cakephp-2-1.rst
	fr/appendices/phpunit-migration-hints.rst
	fr/cakephp-overview/where-to-get-help.rst
	fr/console-and-shells/acl-shell.rst
	fr/console-and-shells/schema-management-and-migrations.rst
	fr/controllers/components.rst
	fr/controllers/request-response.rst
	fr/controllers/scaffolding.rst
	fr/core-libraries/components/access-control-lists.rst
	fr/core-libraries/components/authentication.rst
	fr/core-libraries/components/cookie.rst
	fr/core-libraries/components/pagination.rst
	fr/core-libraries/components/request-handling.rst
	fr/core-libraries/components/security-component.rst
	fr/core-libraries/events.rst
	fr/core-libraries/helpers/form.rst
	fr/core-libraries/helpers/html.rst
	fr/core-libraries/helpers/js.rst
	fr/core-libraries/helpers/rss.rst
	fr/core-libraries/logging.rst
	fr/core-utility-libraries/httpsocket.rst
	fr/development/configuration.rst
	fr/development/testing.rst
	fr/getting-started/cakephp-folder-structure.rst
	fr/installation.rst
	fr/installation/advanced-installation.rst
	fr/models.rst
	fr/models/associations-linking-models-together.rst
	fr/models/behaviors.rst
	fr/models/callback-methods.rst
	fr/models/data-validation.rst
	fr/models/datasources.rst
	fr/models/deleting-data.rst
	fr/models/model-attributes.rst
	fr/models/retrieving-your-data.rst
	fr/models/saving-your-data.rst
	fr/models/virtual-fields.rst
	fr/plugins.rst
	fr/tutorials-and-examples/blog/blog.rst
	fr/tutorials-and-examples/blog/part-two.rst
	fr/views/media-view.rst
	fr/views/themes.rst
	ru/controllers/components.rst
	themes/cakephp/layout.html