Merge branch '2.5' into 3.0

Conflicts:
	en/appendices/2-0-migration-guide.rst
	en/appendices/2-1-migration-guide.rst
	en/appendices/2-2-migration-guide.rst
	en/appendices/2-3-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/phpunit-migration-hints.rst
	en/controllers.rst
	en/controllers/components.rst
	en/controllers/request-response.rst
	en/controllers/scaffolding.rst
	en/core-libraries/caching.rst
	en/core-libraries/collections.rst
	en/core-libraries/components/cookie.rst
	en/core-libraries/events.rst
	en/core-libraries/global-constants-and-functions.rst
	en/core-libraries/helpers/cache.rst
	en/core-libraries/helpers/html.rst
	en/core-libraries/helpers/js.rst
	en/core-libraries/helpers/paginator.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/deployment.rst
	en/development/configuration.rst
	en/development/dispatch-filters.rst
	en/development/errors.rst
	en/development/exceptions.rst
	en/development/routing.rst
	en/development/testing.rst
	en/getting-started/cakephp-folder-structure.rst
	en/installation.rst
	en/installation/advanced-installation.rst
	en/models/associations-linking-models-together.rst
	en/plugins.rst
	en/tutorials-and-examples/blog/blog.rst
	en/tutorials-and-examples/blog/part-two.rst
	en/tutorials-and-examples/simple-acl-controlled-application/simple-acl-controlled-application.rst
	en/views/helpers.rst
	en/views/themes.rst