Merge branch '2.5' into 3.0

Conflicts:
	Cake/Cache/Engine/ApcEngine.php
	Cake/Cache/Engine/RedisEngine.php
	Cake/Cache/Engine/WincacheEngine.php
	Cake/Configure/Engine/IniConfig.php
	Cake/Configure/Engine/PhpConfig.php
	Cake/Console/Command/BakeShell.php
	Cake/Console/Command/Task/FixtureTask.php
	Cake/Console/Command/Task/ModelTask.php
	Cake/Console/Command/Task/PluginTask.php
	Cake/Console/ShellDispatcher.php
	Cake/Console/Templates/default/classes/test.ctp
	Cake/Console/cake.bat
	Cake/Controller/Component/Acl/PhpAcl.php
	Cake/Controller/Component/AuthComponent.php
	Cake/Controller/Component/CookieComponent.php
	Cake/Controller/Component/PaginatorComponent.php
	Cake/Controller/Component/SecurityComponent.php
	Cake/Controller/Component/SessionComponent.php
	Cake/Controller/ErrorController.php
	Cake/Database/Exception.php
	Cake/Error/ExceptionRenderer.php
	Cake/Event/Event.php
	Cake/Event/EventManager.php
	Cake/I18n/I18n.php
	Cake/Log/Engine/ConsoleLog.php
	Cake/Log/Engine/FileLog.php
	Cake/Log/LogInterface.php
	Cake/Network/Email/Email.php
	Cake/Network/Request.php
	Cake/Network/Session.php
	Cake/ORM/Error/MissingEntityException.php
	Cake/Routing/Filter/AssetDispatcher.php
	Cake/Test/Fixture/TranslateWithPrefixFixture.php
	Cake/Test/TestApp/Controller/AppController.php
	Cake/Test/TestApp/Controller/PostsController.php
	Cake/Test/TestApp/Log/Engine/TestAppLog.php
	Cake/Test/TestApp/Model/Behavior/DuplicateBehavior.php
	Cake/Test/TestApp/Model/Behavior/SluggableBehavior.php
	Cake/Test/TestApp/Model/RequestActionPost.php
	Cake/Test/TestApp/Plugin/TestPlugin/Controller/Component/OtherComponent.php
	Cake/Test/TestApp/Plugin/TestPlugin/Model/Behavior/PersisterOneBehavior.php
	Cake/Test/TestApp/Plugin/TestPlugin/Routing/Filter/Test2DispatcherFilter.php
	Cake/Test/TestApp/View/Layout/flash.ctp
	Cake/Test/TestApp/View/Pages/home.ctp
	Cake/Test/TestCase/BasicsTest.php
	Cake/Test/TestCase/Cache/Engine/RedisEngineTest.php
	Cake/Test/TestCase/Configure/Engine/IniConfigTest.php
	Cake/Test/TestCase/Configure/Engine/PhpConfigTest.php
	Cake/Test/TestCase/Console/Command/BakeShellTest.php
	Cake/Test/TestCase/Console/Command/CommandListShellTest.php
	Cake/Test/TestCase/Console/Command/Task/ExtractTaskTest.php
	Cake/Test/TestCase/Console/Command/Task/FixtureTaskTest.php
	Cake/Test/TestCase/Console/Command/Task/ModelTaskTest.php
	Cake/Test/TestCase/Console/Command/Task/TestTaskTest.php
	Cake/Test/TestCase/Console/Command/TestShellTest.php
	Cake/Test/TestCase/Console/ConsoleErrorHandlerTest.php
	Cake/Test/TestCase/Console/ShellDispatcherTest.php
	Cake/Test/TestCase/Console/ShellTest.php
	Cake/Test/TestCase/Controller/Component/Acl/DbAclTest.php
	Cake/Test/TestCase/Controller/Component/Acl/PhpAclTest.php
	Cake/Test/TestCase/Controller/Component/AuthComponentTest.php
	Cake/Test/TestCase/Controller/Component/CookieComponentTest.php
	Cake/Test/TestCase/Controller/Component/PaginatorComponentTest.php
	Cake/Test/TestCase/Controller/Component/RequestHandlerComponentTest.php
	Cake/Test/TestCase/Controller/Component/SecurityComponentTest.php
	Cake/Test/TestCase/Controller/Component/SessionComponentTest.php
	Cake/Test/TestCase/Error/ErrorHandlerTest.php
	Cake/Test/TestCase/Error/ExceptionRendererTest.php
	Cake/Test/TestCase/Event/EventManagerTest.php
	Cake/Test/TestCase/Event/EventTest.php
	Cake/Test/TestCase/I18n/I18nTest.php
	Cake/Test/TestCase/Model/ModelCrossSchemaHabtmTest.php
	Cake/Test/TestCase/Network/Email/EmailTest.php
	Cake/Test/TestCase/Network/RequestTest.php
	Cake/Test/TestCase/Network/SessionTest.php
	Cake/Test/TestCase/Utility/ClassRegistryTest.php
	Cake/Test/TestCase/Utility/FileTest.php
	Cake/Test/TestCase/Utility/FolderTest.php
	Cake/Test/TestCase/Utility/XmlTest.php
	Cake/Test/TestCase/View/Helper/CacheHelperTest.php
	Cake/Test/TestCase/View/Helper/FormHelperTest.php
	Cake/Test/TestCase/View/Helper/NumberHelperTest.php
	Cake/Test/TestCase/View/JsonViewTest.php
	Cake/TestSuite/templates/header.php
	Cake/Utility/Debugger.php
	Cake/View/Error/missing_action.ctp
	Cake/View/Error/missing_controller.ctp
	Cake/View/Helper/CacheHelper.php
	app/Config/Schema/db_acl.php
	app/Config/Schema/i18n.php
	app/Config/Schema/sessions.php
	app/Config/acl.ini.php
	app/Config/acl.php
	app/Config/bootstrap.php
	app/Config/core.php
	app/Config/database.php.default
	app/Config/email.php.default
	app/Config/routes.php
	app/Console/cake
	app/Console/cake.bat
	app/Console/cake.php
	app/Controller/AppController.php
	app/Controller/PagesController.php
	app/Model/AppModel.php
	app/View/Emails/text/default.ctp
	app/View/Helper/AppHelper.php
	app/View/Layouts/Emails/html/default.ctp
	app/View/Layouts/default.ctp
	app/View/Layouts/error.ctp
	app/View/Layouts/flash.ctp
	app/View/Pages/home.ctp
	app/webroot/index.php
	app/webroot/test.php
	index.php
	lib/Cake/Cache/Engine/MemcacheEngine.php
	lib/Cake/Config/unicode/casefolding/0080_00ff.php
	lib/Cake/Config/unicode/casefolding/0100_017f.php
	lib/Cake/Config/unicode/casefolding/0180_024F.php
	lib/Cake/Config/unicode/casefolding/0250_02af.php
	lib/Cake/Config/unicode/casefolding/0370_03ff.php
	lib/Cake/Config/unicode/casefolding/0400_04ff.php
	lib/Cake/Config/unicode/casefolding/0500_052f.php
	lib/Cake/Config/unicode/casefolding/0530_058f.php
	lib/Cake/Config/unicode/casefolding/1e00_1eff.php
	lib/Cake/Config/unicode/casefolding/1f00_1fff.php
	lib/Cake/Config/unicode/casefolding/2100_214f.php
	lib/Cake/Config/unicode/casefolding/2150_218f.php
	lib/Cake/Config/unicode/casefolding/2460_24ff.php
	lib/Cake/Config/unicode/casefolding/2c00_2c5f.php
	lib/Cake/Config/unicode/casefolding/2c60_2c7f.php
	lib/Cake/Config/unicode/casefolding/2c80_2cff.php
	lib/Cake/Config/unicode/casefolding/ff00_ffef.php
	lib/Cake/Console/Command/ApiShell.php
	lib/Cake/Console/Command/Task/ProjectTask.php
	lib/Cake/Console/Command/TestsuiteShell.php
	lib/Cake/Console/Command/UpgradeShell.php
	lib/Cake/Console/ConsoleErrorHandler.php
	lib/Cake/Console/Templates/skel/Config/Schema/db_acl.php
	lib/Cake/Console/Templates/skel/Config/Schema/i18n.php
	lib/Cake/Console/Templates/skel/Config/Schema/sessions.php
	lib/Cake/Console/Templates/skel/Config/acl.ini.php
	lib/Cake/Console/Templates/skel/Config/acl.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/Config/email.php.default
	lib/Cake/Console/Templates/skel/Config/routes.php
	lib/Cake/Console/Templates/skel/Console/Command/AppShell.php
	lib/Cake/Console/Templates/skel/Console/cake
	lib/Cake/Console/Templates/skel/Console/cake.bat
	lib/Cake/Console/Templates/skel/Console/cake.php
	lib/Cake/Console/Templates/skel/Controller/AppController.php
	lib/Cake/Console/Templates/skel/Controller/PagesController.php
	lib/Cake/Console/Templates/skel/Model/AppModel.php
	lib/Cake/Console/Templates/skel/View/Emails/html/default.ctp
	lib/Cake/Console/Templates/skel/View/Errors/error400.ctp
	lib/Cake/Console/Templates/skel/View/Errors/error500.ctp
	lib/Cake/Console/Templates/skel/View/Helper/AppHelper.php
	lib/Cake/Console/Templates/skel/View/Layouts/Emails/html/default.ctp
	lib/Cake/Console/Templates/skel/View/Layouts/Emails/text/default.ctp
	lib/Cake/Console/Templates/skel/View/Layouts/ajax.ctp
	lib/Cake/Console/Templates/skel/View/Layouts/default.ctp
	lib/Cake/Console/Templates/skel/View/Layouts/error.ctp
	lib/Cake/Console/Templates/skel/index.php
	lib/Cake/Console/Templates/skel/webroot/index.php
	lib/Cake/Console/Templates/skel/webroot/test.php
	lib/Cake/Console/cake.php
	lib/Cake/Controller/Component.php
	lib/Cake/Controller/Component/Auth/BlowfishAuthenticate.php
	lib/Cake/Controller/Component/EmailComponent.php
	lib/Cake/Core/App.php
	lib/Cake/Core/CakePlugin.php
	lib/Cake/Core/Object.php
	lib/Cake/Error/ErrorHandler.php
	lib/Cake/Error/exceptions.php
	lib/Cake/I18n/Multibyte.php
	lib/Cake/Log/CakeLog.php
	lib/Cake/Log/Engine/BaseLog.php
	lib/Cake/Log/LogEngineCollection.php
	lib/Cake/Model/Behavior/ContainableBehavior.php
	lib/Cake/Model/CakeSchema.php
	lib/Cake/Model/ConnectionManager.php
	lib/Cake/Model/Datasource/Database/Mysql.php
	lib/Cake/Model/Datasource/Database/Postgres.php
	lib/Cake/Model/Datasource/Database/Sqlite.php
	lib/Cake/Model/Datasource/Database/Sqlserver.php
	lib/Cake/Model/Datasource/DboSource.php
	lib/Cake/Network/Http/BasicAuthentication.php
	lib/Cake/Network/Http/DigestAuthentication.php
	lib/Cake/Network/Http/HttpResponse.php
	lib/Cake/Network/Http/HttpSocket.php
	lib/Cake/Network/Http/HttpSocketResponse.php
	lib/Cake/Routing/Router.php
	lib/Cake/Test/Case/AllBehaviorsTest.php
	lib/Cake/Test/Case/AllCacheTest.php
	lib/Cake/Test/Case/AllComponentsTest.php
	lib/Cake/Test/Case/AllConfigureTest.php
	lib/Cake/Test/Case/AllConsoleTest.php
	lib/Cake/Test/Case/AllControllerTest.php
	lib/Cake/Test/Case/AllCoreTest.php
	lib/Cake/Test/Case/AllDatabaseTest.php
	lib/Cake/Test/Case/AllDbRelatedTest.php
	lib/Cake/Test/Case/AllErrorTest.php
	lib/Cake/Test/Case/AllEventTest.php
	lib/Cake/Test/Case/AllHelpersTest.php
	lib/Cake/Test/Case/AllI18nTest.php
	lib/Cake/Test/Case/AllLogTest.php
	lib/Cake/Test/Case/AllNetworkTest.php
	lib/Cake/Test/Case/AllRoutingTest.php
	lib/Cake/Test/Case/AllTestSuiteTest.php
	lib/Cake/Test/Case/AllTestsTest.php
	lib/Cake/Test/Case/AllUtilityTest.php
	lib/Cake/Test/Case/AllViewTest.php
	lib/Cake/Test/Case/Cache/CacheTest.php
	lib/Cake/Test/Case/Cache/Engine/MemcacheEngineTest.php
	lib/Cake/Test/Case/Console/AllConsoleLibsTest.php
	lib/Cake/Test/Case/Console/AllConsoleTest.php
	lib/Cake/Test/Case/Console/AllShellsTest.php
	lib/Cake/Test/Case/Console/AllTasksTest.php
	lib/Cake/Test/Case/Console/Command/ApiShellTest.php
	lib/Cake/Test/Case/Console/Command/SchemaShellTest.php
	lib/Cake/Test/Case/Console/Command/Task/ProjectTaskTest.php
	lib/Cake/Test/Case/Console/TaskCollectionTest.php
	lib/Cake/Test/Case/Controller/Component/Auth/BlowfishAuthenticateTest.php
	lib/Cake/Test/Case/Controller/Component/EmailComponentTest.php
	lib/Cake/Test/Case/Controller/ComponentCollectionTest.php
	lib/Cake/Test/Case/Controller/ComponentTest.php
	lib/Cake/Test/Case/Controller/ControllerMergeVarsTest.php
	lib/Cake/Test/Case/Core/AppTest.php
	lib/Cake/Test/Case/Core/CakePluginTest.php
	lib/Cake/Test/Case/Core/ObjectTest.php
	lib/Cake/Test/Case/I18n/MultibyteTest.php
	lib/Cake/Test/Case/Log/CakeLogTest.php
	lib/Cake/Test/Case/Log/Engine/ConsoleLogTest.php
	lib/Cake/Test/Case/Log/LogEngineCollectionTest.php
	lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php
	lib/Cake/Test/Case/Model/CakeSchemaTest.php
	lib/Cake/Test/Case/Model/ConnectionManagerTest.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/Validator/CakeValidationRuleTest.php
	lib/Cake/Test/Case/Network/Http/BasicAuthenticationTest.php
	lib/Cake/Test/Case/Network/Http/DigestAuthenticationTest.php
	lib/Cake/Test/Case/Network/Http/HttpResponseTest.php
	lib/Cake/Test/Case/Network/Http/HttpSocketTest.php
	lib/Cake/Test/Case/Routing/DispatcherTest.php
	lib/Cake/Test/Case/Routing/Filter/AssetDispatcherTest.php
	lib/Cake/Test/Case/TestSuite/CakeTestFixtureTest.php
	lib/Cake/Test/Case/Utility/SanitizeTest.php
	lib/Cake/Test/Case/Utility/StringTest.php
	lib/Cake/Test/Case/View/Helper/JqueryEngineHelperTest.php
	lib/Cake/Test/Case/View/Helper/JsHelperTest.php
	lib/Cake/Test/Case/View/Helper/MootoolsEngineHelperTest.php
	lib/Cake/Test/Case/View/Helper/PaginatorHelperTest.php
	lib/Cake/Test/Case/View/Helper/PrototypeEngineHelperTest.php
	lib/Cake/Test/Case/View/HelperCollectionTest.php
	lib/Cake/Test/Case/View/MediaViewTest.php
	lib/Cake/Test/Case/View/ScaffoldViewTest.php
	lib/Cake/Test/Case/View/ThemeViewTest.php
	lib/Cake/Test/Fixture/ArticleFeaturedFixture.php
	lib/Cake/Test/Fixture/ArticleFeaturedsTagsFixture.php
	lib/Cake/Test/Fixture/AuthUserCustomFieldFixture.php
	lib/Cake/Test/Fixture/AuthUserFixture.php
	lib/Cake/Test/Fixture/AuthorFixture.php
	lib/Cake/Test/Fixture/CampaignFixture.php
	lib/Cake/Test/Fixture/TagFixture.php
	lib/Cake/Test/Fixture/UserFixture.php
	lib/Cake/Test/test_app/Model/Behavior/PersisterTwoBehaviorBehavior.php
	lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Log/Engine/TestPluginLog.php
	lib/Cake/Test/test_app/Plugin/TestPlugin/Model/Behavior/TestPluginPersisterOneBehavior.php
	lib/Cake/Test/test_app/Plugin/TestPlugin/Model/Behavior/TestPluginPersisterTwoBehavior.php
	lib/Cake/Test/test_app/Plugin/TestPlugin/View/Helper/OtherHelperHelper.php
	lib/Cake/Utility/Sanitize.php
	lib/Cake/View/Helper/JqueryEngineHelper.php
	lib/Cake/View/Helper/JsHelper.php
	lib/Cake/View/Helper/PrototypeEngineHelper.php
	lib/Cake/View/MediaView.php
	lib/Cake/View/ThemeView.php
	lib/Cake/bootstrap.php