Merge pull request #2201 from ravage84/start-viewblock-twice

Throw an exception when starting a view block twice
add mkv mime file type
Merge pull request #2213 from zoghal/2.x-fixme

add mkv mime file type
fix spell of contentType
optimise download file
fix multi connection/part downloading file
update tests
update tests
Merge remote-tracking branch 'cakephp/master' into 2.x-fix-download-multi-connection
Merge pull request #2199 from ravage84/gitattributes

Added a .gitattributes file to set the line ending behavior when checkin...
Change Cake to CakePHP
Merge pull request #2225 from bcrowe/hotfix-cakephp

Change Cake to CakePHP
Fix cookie component being inconsistent about writes.

Instead of treating multi-key and single key writes differently, they
should be treated consistently to allow simpler and more consistent interactions
with the stored data. This also results in fewer cookies being sent
across the wire which is an added benefit.

Fixes #2182
Update docs for CookieComponent::delete().

Refs #2182
Shift script install files around to put .bat first.

Hopefully this addresses installation issues on windows using composer.

Fixes #2145
Merge pull request #2219 from zoghal/2.x-fix-download-multi-connection

2.x fix download multi connection/optimise serve file
Update doc block and remove inline assignment.
Changed to UNIX line ending
Merge branch 'master' into 2.5

Conflicts:
	CONTRIBUTING.md
	lib/Cake/Model/Model.php
	lib/Cake/VERSION.txt
Remove use of deprecated constants.

Fixes #2232