Changing the orther of the ORM chapters to better accomodate what a new
user would expect
Somewhat easier to understand advanced query conditions
Fixed reference
Merge pull request #1041 from cakephp/3.0-structure-changes

3.0 - small structure changes