Dirty hacking as a proof of concept of separating matching and contain
Fixing a failing tests and marking another as icomplete
Fixing __debugInfo for the query
Moving code from ResultSet to EagerLoader as it needed to access too much
internal info
Fixing doc blocks and setting property back to protected
Managed to not use matching() for loading belognsToMany

This will help with separating the results from matching and everything else
Placing data generated by matching into a _matchingData key for each row.

As the data completely breaks how entities are naturally nested, it makes
more sense to have it in its own place. This also permits using matching
and contain in the same query
Adding test to prove that using contain and matchin on the same assoc works
Removing exception that prevented matching and contain in the same association

This type of conflic is not possible anymore
Adding some doc blocks
Fixing code for PHP 5.4
Fixing doc blocks
Documentation fixups for matching improvements.
A first approach to separating hydration of associations from the main loop

This will make the associations hydration more robust
Restructuring how the junction table results are returned for matching,
there is no good reason for nesting them into another alias.
Cleaning up some code in ResultSet
Adding test to prove that matching() and contain() work for the same
association path
Merge branch '3.0-better-matching' of github.com:cakephp/cakephp into 3.0-better-matching
Improving doc blocks
Fixed CS errors