Bump version for 2.6.0-dev.
Merge branch '2.5' into 2.6
Merge branch '2.5' into 2.6
Merge branch '2.5' into 2.6
Backporting overwrite() from 3.0 to 2.6.
Merge branch '2.5' into 2.6

Conflicts:
	lib/Cake/VERSION.txt
Merge branch '2.6' of github.com:cakephp/cakephp into 2.6-overwrite
Merge pull request #3412 from dereuromark/2.6-overwrite

Backporting overwrite() from 3.0 to 2.6.
Merge branch '2.5' into 2.6
Merge branch 'master' into 2.5
Merge branch '2.5' into 2.6
Merge branch '2.5' into 2.6
Added $type as an argument.
See https://github.com/cakephp/cakephp/issues/2122
closes #3303 RFC: Rename Validator::between() into Validator::length()
replaces validator 'between' with 'lengthBetween'
fixes falling test case for 'lengthBetween' validator
adds backwards compatible 'between' alias for 'lengthBetween' validation rule
Merge pull request #3471 from coencoppens/issue-2122

Issue 2122
fixes model task test-cases for 'between' validation rule alias
Merge branch 'master' into 2.6

Conflicts:
	lib/Cake/VERSION.txt