Update CSS for traits.
fix grammar in migration guide
Merge pull request #427 from dereuromark/3.0-docs

fix grammar in migration guide
grammer
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
Merge branch 'master' into 3.0

Conflicts:
	en/appendices/2-3-migration-guide.rst
	en/development/routing.rst
Update installation docs.
Update advanced install docs.
Update more documentation.
Include how to install composer.
Fix a few things.
Fix filenames.
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
Start porting docs from wiki page to official docs.
Update docs for Http\Client
Update version number in the 3.x branch.
Add better internal links.
Update migration guide.
Merge branch '3.0-httpsocket' into 3.0
Add docs for decoding data.