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
Make referer() behave as expected.
Fix test
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
Add formatting rules for .yml files to editorconfig.
Merge branch 'master' into 2.5
Merge branch '2.5' into 2.6
Make test names match the rest of the tests.
Ensure that only the path and query are used to make the hash.

While including the entire protocol, host, port, path and query would be
even better in theory, it gets complicated when proxies and load
balancers are involved.

Fixes #3442
Fix incorrectly generated URL path.

Refs #3442
Merge pull request #3448 from dereuromark/master-controller

Controller::referer() and local URL
Only parse URLs when they contain ://

Parsing incomplete URLs fails in PHP5.2.
Merge branch 'fix-formhelper'

Fix failing tests on PHP5.2.x