Merge branch 'master' into 3.0

Conflicts:
	en/console-and-shells.rst
	en/console-and-shells/code-generation-with-bake.rst
	en/console-and-shells/schema-management-and-migrations.rst
	en/core-libraries/components/pagination.rst
	en/core-libraries/helpers/js.rst
	en/development.rst
	en/development/sessions.rst
	en/getting-started/cakephp-conventions.rst
	en/installation/advanced-installation.rst
	en/models/associations-linking-models-together.rst
	en/models/saving-your-data.rst
	en/tutorials-and-examples/blog/blog.rst
	en/tutorials-and-examples/simple-acl-controlled-application/simple-acl-controlled-application.rst
	en/views/media-view.rst
	fr/console-and-shells/schema-management-and-migrations.rst
	fr/contributing/code.rst
	fr/controllers.rst
	fr/controllers/request-response.rst
	fr/core-libraries/behaviors/translate.rst
	fr/core-libraries/caching.rst
	fr/core-libraries/components/authentication.rst
	fr/core-libraries/components/pagination.rst
	fr/core-libraries/helpers/form.rst
	fr/core-libraries/helpers/html.rst
	fr/core-libraries/helpers/js.rst
	fr/core-utility-libraries/app.rst
	fr/core-utility-libraries/security.rst
	fr/deployment.rst
	fr/development/routing.rst
	fr/development/sessions.rst
	fr/installation/url-rewriting.rst
	fr/models/saving-your-data.rst
	fr/plugins.rst
	fr/views.rst
	pt/contributing/code.rst
	pt/development.rst
	pt/index.rst
	pt/installation.rst
	pt/tutorials-and-examples/blog-auth-example/auth.rst
	sr/tutorials-and-examples/simple-acl-controlled-application/simple-acl-controlled-application.rst