Merge branch 'master' into 3.0

Conflicts:
	README.mdown
	en/appendices/2-5-migration-guide.rst
	en/contributing/cakephp-coding-conventions.rst
	en/core-libraries/behaviors/containable.rst
	en/development/routing.rst
	en/installation/advanced-installation.rst
	en/installation/url-rewriting.rst
	en/models/associations-linking-models-together.rst
	en/models/data-validation.rst
	en/models/saving-your-data.rst
	en/views.rst
	fr/appendices/2-5-migration-guide.rst
	fr/contributing/cakephp-coding-conventions.rst
	fr/core-libraries/behaviors/containable.rst
	fr/development/routing.rst
	fr/installation/advanced-installation.rst
	fr/installation/url-rewriting.rst
	fr/models/associations-linking-models-together.rst
	fr/models/data-validation.rst
	fr/models/saving-your-data.rst
	fr/tutorials-and-examples/blog/part-two.rst
	fr/views.rst