Merge branch '2.4' into 3.0

Conflicts:
	en/appendices.rst
	en/appendices/2-0-migration-guide.rst
	en/appendices/2-3-migration-guide.rst
	en/appendices/new-features-in-cakephp-1-3.rst
	en/console-and-shells.rst
	en/controllers.rst
	en/core-libraries/caching.rst
	en/core-libraries/logging.rst
	en/core-utility-libraries/email.rst
	en/development/configuration.rst
	en/installation.rst
	en/installation/advanced-installation.rst
	en/tutorials-and-examples/blog/blog.rst