Merge branch 'master' 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/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/controllers.rst
	en/core-libraries/caching.rst
	en/core-libraries/helpers/paginator.rst
	en/core-libraries/logging.rst
	en/core-utility-libraries/email.rst
	en/development/configuration.rst
	en/development/dispatch-filters.rst
	en/development/errors.rst
	en/development/exceptions.rst
	en/development/routing.rst
	en/views.rst