Fix coding standards in comment.
Merge pull request #1704 from cakephp/2.5-cache

2.5 - Add Cache::remember()
Merge branch 'master' into 2.5
Fix whitelist to be modifiable from behaviors to work with validate.
Add doc block
Simplify test.
Merge pull request #1708 from dereuromark/2.5-behavior-whitelist

Fix whitelist to be modifiable from behaviors to work with validate.
Strict checks where applicable.
Optimized whitelist jugglery.
Merge pull request #1711 from dereuromark/2.5-strict

Strict checks where applicable.
Merge pull request #1713 from ADmad/2.5-modelvalidator-optimize

Optimized whitelist jugglery.
Merge pull request #1644 from WyriHaximus/2.5

Add CompletionShell to allow easier development of shell scripts to provide autocompletion in environments like bash.
Merge branch 'master' of github.com:k-halaburda/cakephp into k-halaburda-master
Merge remote-tracking branch 'origin/2.5' into k-halaburda-master
Merge pull request #1691 from uzyn/2.5-decimal

Add support for decimal type in Schema.

Fixes #3171
Merge branch 'master' into 2.5
Added binary type to field type map, defaulting to file input field

Refs  https://github.com/cakephp/cakephp/issues/2071
Added display of CakePHP version to the default layout

Refs https://github.com/cakephp/cakephp/issues/2077#issuecomment-26377120
Merge pull request #2141 from ravage84/footer-cakephp-version

Added display of CakePHP version to the default layout
Merge pull request #2139 from ravage84/file-inputs-for-binary-fields

Added binary type to field type map, defaulting to file input field