Merge remote-tracking branch 'origin/3.0' into 3.0-entity
Making Entity::has() return false on null values
fixes FileLog doesn't delete on rotation if `rotate` = 0
Fix coding standards in comment.
Merge pull request #1704 from cakephp/2.5-cache

2.5 - Add Cache::remember()
Initial implementation of entity class and table class linking
Fixing and unit testing the Entity::repository() method
Initial implementation of automatic setup of associations
Adding test for configuring association using extra options
Merge branch 'master' into 2.5
Merge remote-tracking branch 'origin/2.5' into 3.0

Conflicts:
	Cake/Test/TestCase/View/ViewTest.php
	lib/Cake/Test/Case/Controller/ControllerTest.php
Use quoted identifiers instead of bound parameters.

Schema reflection required quoted identifiers on certain MySQL versions.
Using bound parameters results in queries that cause SQL errors.
Fix failing test from 2.5
Correct method names and missing parent calls.
Testing automatic loading of hasMany and hasOne associations
More explicit assertions
Fix whitelist to be modifiable from behaviors to work with validate.
Add doc block
Implemented 'with' relations and testing belongsToMany
Simplify test.