Start the 2.5.x branch.
Accept 'connectOptions' in Router::mapResources()
Merge pull request #1536 from rchavik/2.5-map-resources

Accept 'connectOptions' in Router::mapResources()
Merge branch '2.4' into 2.5

Conflicts:
	lib/Cake/VERSION.txt
Ticket 4011 - Adding matchers support for Hash::remove() and Hash::insert()
convert forbidden character in filename(Windows) with underline
convert forbidden character in filename(Windows) with underline
Merge pull request #1553 from zoghal/cache-fileengin

convert forbidden character in filename(on Windows) with underline
Merge pull request #1549 from hencohen/ticket-4011

Ticket 4011 - Add support for matchers in Hash::remove() and Hash::insert()
Minor simplification.
Merge branch 'master' into 2.4
Fix failing test.

Quote encoding in confirm handlers has changed in 2.4. Update the
relevant test.
Merge branch '2.4' into 2.5
remove $name where not necessary to unify this in 2.x
also remove app ones
Merge pull request #1558 from dereuromark/2.4-unify-name

2.4 unify name
Avoid reparsing locale definition file.
Allow 'options' to be given as array when adding a param detector - similar to env / options.

Allow the following when adding request detectors using CakeRequest::addDetector():

    array('param'=>'{param-name}', 'options'=>array())
Added test case for param with options detector.

Fix coding standards errors.
Merge pull request 1567 from calin-s into 2.5

Add ability to provide a list of valid param values when adding param
based detectors.

Refs #GH-1567