Merge branch 'master' into 3.0

Conflicts:
	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/installation/advanced-installation.rst