Merge branch 'master' into 3.0

Conflicts:
	en/appendices/2-5-migration-guide.rst
	en/controllers.rst
	en/core-libraries/components/access-control-lists.rst
	en/core-libraries/components/cookie.rst
	en/core-libraries/components/sessions.rst
	en/core-utility-libraries/security.rst
	en/models.rst
	en/models/retrieving-your-data.rst
	en/tutorials-and-examples/blog-auth-example/auth.rst
	en/tutorials-and-examples/blog/part-two.rst
	fr/appendices/2-5-migration-guide.rst
	fr/controllers.rst
	fr/core-libraries/components/access-control-lists.rst
	fr/core-libraries/helpers/paginator.rst
	fr/models.rst
	fr/models/retrieving-your-data.rst
	fr/tutorials-and-examples/blog-auth-example/auth.rst
	fr/tutorials-and-examples/blog/part-two.rst