Merge branch '2.5' into 3.0

Conflicts:
	lib/Cake/Cache/Cache.php
	lib/Cake/Console/Command/Task/DbConfigTask.php
	lib/Cake/Console/Command/Task/ModelTask.php
	lib/Cake/Console/Command/TestShell.php
	lib/Cake/Console/Command/UpgradeShell.php
	lib/Cake/Controller/Component.php
	lib/Cake/Controller/Controller.php
	lib/Cake/Core/CakePlugin.php
	lib/Cake/Core/Object.php
	lib/Cake/Model/Behavior/TreeBehavior.php
	lib/Cake/Model/Datasource/Database/Sqlite.php
	lib/Cake/Model/Model.php
	lib/Cake/Model/ModelValidator.php
	lib/Cake/Model/Validator/CakeValidationSet.php
	lib/Cake/Network/Http/HttpSocket.php
	lib/Cake/Routing/Router.php
	lib/Cake/Test/Case/Cache/CacheTest.php
	lib/Cake/Test/Case/Console/Command/Task/TestTaskTest.php
	lib/Cake/Test/Case/Controller/Component/EmailComponentTest.php
	lib/Cake/Test/Case/Controller/Component/PaginatorComponentTest.php
	lib/Cake/Test/Case/Controller/ScaffoldTest.php
	lib/Cake/Test/Case/Core/AppTest.php
	lib/Cake/Test/Case/Core/CakePluginTest.php
	lib/Cake/Test/Case/Log/CakeLogTest.php
	lib/Cake/Test/Case/Log/Engine/ConsoleLogTest.php
	lib/Cake/Test/Case/Model/Behavior/AclBehaviorTest.php
	lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php
	lib/Cake/Test/Case/Model/Behavior/TranslateBehaviorTest.php
	lib/Cake/Test/Case/Model/BehaviorCollectionTest.php
	lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
	lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php
	lib/Cake/Test/Case/Model/Datasource/Database/SqliteTest.php
	lib/Cake/Test/Case/Model/Datasource/Database/SqlserverTest.php
	lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
	lib/Cake/Test/Case/Model/ModelIntegrationTest.php
	lib/Cake/Test/Case/Model/ModelReadTest.php
	lib/Cake/Test/Case/Model/ModelValidationTest.php
	lib/Cake/Test/Case/Model/ModelWriteTest.php
	lib/Cake/Test/Case/Model/models.php
	lib/Cake/Test/Case/Network/Http/HttpResponseTest.php
	lib/Cake/Test/Case/Routing/DispatcherTest.php
	lib/Cake/Test/Case/Routing/Filter/AssetDispatcherTest.php
	lib/Cake/Test/Case/Routing/RouterTest.php
	lib/Cake/Test/Case/Utility/ClassRegistryTest.php
	lib/Cake/Test/Case/Utility/ObjectCollectionTest.php
	lib/Cake/Test/Case/Utility/SetTest.php
	lib/Cake/Test/Case/View/Helper/FormHelperTest.php
	lib/Cake/Test/Case/View/Helper/NumberHelperTest.php
	lib/Cake/TestSuite/CakeTestSuiteCommand.php
	lib/Cake/TestSuite/Fixture/CakeTestModel.php
	lib/Cake/TestSuite/Reporter/CakeBaseReporter.php
	lib/Cake/Utility/ClassRegistry.php
	lib/Cake/Utility/ObjectCollection.php
	lib/Cake/Utility/Sanitize.php
	lib/Cake/Utility/Set.php
	lib/Cake/View/Helper.php
	lib/Cake/View/Helper/FormHelper.php
	lib/Cake/View/Helper/JqueryEngineHelper.php
	lib/Cake/View/Helper/JsBaseEngineHelper.php
	lib/Cake/View/Helper/JsHelper.php
	lib/Cake/View/Helper/MootoolsEngineHelper.php
	lib/Cake/View/Helper/PaginatorHelper.php
	lib/Cake/View/Helper/PrototypeEngineHelper.php
	src/Console/ConsoleOptionParser.php
	src/Controller/Component/Acl/PhpAcl.php
	src/Event/EventManager.php
	src/Network/Email/Email.php
	src/Routing/Filter/AssetDispatcher.php
	src/TestSuite/ControllerTestCase.php
	src/Utility/Folder.php
	src/Utility/Number.php
	src/Utility/String.php
	src/View/Helper/HtmlHelper.php
	src/View/Helper/NumberHelper.php
	src/View/XmlView.php
	tests/TestCase/Console/ConsoleOptionParserTest.php
	tests/TestCase/Controller/Component/Auth/ControllerAuthorizeTest.php
	tests/TestCase/Controller/Component/SecurityComponentTest.php
	tests/TestCase/Core/ConfigureTest.php
	tests/TestCase/Network/Email/EmailTest.php
	tests/TestCase/Network/ResponseTest.php
	tests/TestCase/Network/SocketTest.php
	tests/TestCase/TestSuite/ControllerTestCaseTest.php
	tests/TestCase/TestSuite/TestCaseTest.php
	tests/TestCase/Utility/XmlTest.php
	tests/TestCase/View/Helper/TimeHelperTest.php
Merge pull request #3267 from ADmad/3.0-merge

3.0 merge