Merge branch 'master' into 2.5

Conflicts:
	CONTRIBUTING.md
	lib/Cake/Model/Datasource/DboSource.php
Fixed CS error
Merge pull request #3088 from markstory/3.0-controller-bake

3.0 controller bake
Fixing error were results from joined tables would dissapear from
resultset
Removing, for now, the join table information when using 'matching'

Hydrating the join table with matching presents several challenges,
revisit this commit upon the first bug report asking for the extra table
info :)
Added order clause to test to avoid errors in different db drivers
Fixed CS error
Update AuthComponentTest.php

Error CS Cake\Controller\Componenent\
Merge pull request #3098 from EliuFlorez/patch-5

Update AuthComponentTest.php
Adding test to disprove #3807
Using de default column types for binding condition params for
associations
Fixed more unit tests
Fixed remaining tests
Fixed CS error
Associations can now be fetched as properties in a table
Merge pull request #3099 from cakephp/3.0-ticket-3807

Adding test to disprove #3807
Merge pull request #3102 from cakephp/3.0-association-as-properties

3.0 association as properties.

Fixes #3095
Attaching extra conditions to the association query before the
beforeFind event is triggered
Merge pull request #3097 from cakephp/3.0-joins-fixes

3.0 joins fixes
Merge pull request #3101 from cakephp/3.0-association-default-types

3.0 association default types