Merge branch 'master' into 3.0

Conflicts:
	en/contributing/cakephp-coding-conventions.rst
	en/core-libraries/behaviors/containable.rst
	en/core-libraries/components/access-control-lists.rst
	en/core-libraries/helpers/text.rst
	en/core-libraries/logging.rst
	en/core-utility-libraries/app.rst
	en/development/configuration.rst
	en/development/routing.rst
	en/installation/advanced-installation.rst
	en/models/data-validation.rst
	en/models/retrieving-your-data.rst
	en/models/saving-your-data.rst
	en/models/virtual-fields.rst
	en/views/helpers.rst
	en/views/themes.rst
	fr/contributing/cakephp-coding-conventions.rst
	fr/core-libraries/behaviors/containable.rst
	fr/core-libraries/helpers/form.rst
	fr/core-libraries/helpers/html.rst
	fr/core-libraries/logging.rst
	fr/core-utility-libraries/httpsocket.rst
	fr/core-utility-libraries/string.rst
	fr/development/configuration.rst
	fr/development/routing.rst
	fr/installation/advanced-installation.rst
	fr/models/retrieving-your-data.rst
	fr/models/saving-your-data.rst
	fr/models/virtual-fields.rst