Merge branch '2.5' into 3.0

Conflicts:
	CONTRIBUTING.md
	Cake/Cache/Cache.php
	Cake/Console/Command/AclShell.php
	Cake/Console/Command/Task/CommandTask.php
	Cake/Console/Command/Task/TestTask.php
	Cake/Model/Model.php
	Cake/Routing/Dispatcher.php
	Cake/Routing/Route/Route.php
	Cake/Test/TestApp/View/Layout/flash.ctp
	Cake/Test/TestApp/View/Pages/home.ctp
	Cake/Test/TestCase/Console/Command/Task/ExtractTaskTest.php
	Cake/Test/TestCase/Console/Command/Task/TestTaskTest.php
	Cake/Test/TestCase/Network/Email/EmailTest.php
	Cake/View/Helper.php
	Cake/View/Helper/NumberHelper.php
	Cake/View/Helper/PaginatorHelper.php
	Cake/View/Helper/TimeHelper.php
	README.md
	app/Config/database.php.default
	app/Config/email.php.default
	app/Console/cake.php
	app/View/Pages/home.ctp
	app/webroot/index.php
	app/webroot/test.php
	lib/Cake/Console/Command/SchemaShell.php
	lib/Cake/Console/Templates/skel/Config/bootstrap.php
	lib/Cake/Console/Templates/skel/Config/core.php
	lib/Cake/Console/Templates/skel/Config/database.php.default
	lib/Cake/Console/Templates/skel/Console/cake.php
	lib/Cake/Console/Templates/skel/View/Layouts/rss/default.ctp
	lib/Cake/Console/Templates/skel/webroot/index.php
	lib/Cake/Console/Templates/skel/webroot/test.php
	lib/Cake/Log/CakeLog.php
	lib/Cake/Model/CakeSchema.php
	lib/Cake/Model/Datasource/Database/Sqlserver.php
	lib/Cake/Model/Datasource/DboSource.php
	lib/Cake/Network/Http/HttpSocket.php
	lib/Cake/Routing/Router.php
	lib/Cake/Test/Case/Console/Command/SchemaShellTest.php
	lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php
	lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
	lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
	lib/Cake/Test/Case/Routing/Filter/AssetDispatcherTest.php
	lib/Cake/Test/Case/View/Helper/JqueryEngineHelperTest.php
	lib/Cake/Test/Case/View/Helper/PaginatorHelperTest.php
	lib/Cake/Test/test_app/View/Pages/home.ctp
	lib/Cake/View/Helper/JqueryEngineHelper.php
	lib/Cake/View/Helper/JsBaseEngineHelper.php