Merge branch 'master' into 2.3


	See: cakephp/cakephp@d0d13acaf44051bbdfa3bebba6907ee5e99c3cb8
Merge branch 'master' into 2.3

Conflicts:
	lib/Cake/VERSION.txt


	See: cakephp/cakephp@735517ade1de9e938889ddf74c2fe969d7402924
Merge pull request #1065 from frankfoerster/3.0-database

resolve PHPDoc errors and typos

	See: cakephp/cakephp@81ca05755b227c8d6e55d121e9835ab285988664
Merge pull request #1069 from radig/master

Ensure $sources is Array ( fix #3520 )

	See: cakephp/cakephp@6e4d522a02bca345a06e0fc5203e8ea0b4da7fe4
Merge pull request #1070 from dereuromark/2.3-cleanup

fix doc block endings

	See: cakephp/cakephp@ead469fff38b9166803e098946c8394c4eab34aa
Merge pull request #1071 from dogmatic69/currency-format

'0.0' and 0 should be formatted consistent.

Fixes #3525



	See: cakephp/cakephp@1a699ee1ceb6d3f7606f3dd484c7adf3157e6bed
Merge pull request #1063 from ADmad/2.3-cakeplugin

Added feature to ignore include errors for CakePlugin

	See: cakephp/cakephp@d571b056f433d77c5ce5e8925ee398030ea04c07
Merge pull request #1067 from ceeram/paginatecount

Avoid calling paginateCount when there are no results.

	See: cakephp/cakephp@e7330fa5856bf2a2acf30a5cb852a79f7b21662f
Merge branch '3.0' into 3.0-httpsocket


	See: cakephp/cakephp@b4a5edfeaca70d2b91331ab0dc94fbb739559be3
Display exact PDO error on default homepage


	See: cakephp/cakephp@d6c2df7b6b4c8d41b6e99a05e45fc1d00f66cf13
Merge branch '3.0-database' of github.com:cakephp/cakephp into 3.0-database


	See: cakephp/cakephp@59c032e55a1c2e49c6259d93668def8cef4c6039
Merge pull request #1072 from uzyn/httpresponse-3531

Add OK or Successful HTTP codes 200-206 to HttpResponse::isOK().

Fixes #3531

	See: cakephp/cakephp@a1035f720e10c0f55f70f48a41f4b6b4fc5a20c0
Merge branch 'master' into 2.3

Conflicts:
	lib/Cake/Network/Http/HttpResponse.php


	See: cakephp/cakephp@9c29fab4a4fb8869f25ddc9eff57ddaba8add934
Merge remote-tracking branch 'origin/2.3' into 3.0

Conflicts:
	App/Config/datasources.default.php
	app/Config/core.php
	lib/Cake/Cache/Cache.php
	lib/Cake/Configure/PhpReader.php
	lib/Cake/Console/Shell.php
	lib/Cake/Console/TaskCollection.php
	lib/Cake/Console/Templates/skel/Config/core.php
	lib/Cake/Console/Templates/skel/Config/email.php.default
	lib/Cake/Console/Templates/skel/Config/routes.php
	lib/Cake/Console/Templates/skel/View/Layouts/default.ctp
	lib/Cake/Console/Templates/skel/View/Layouts/error.ctp
	lib/Cake/Console/Templates/skel/View/Layouts/flash.ctp
	lib/Cake/Console/Templates/skel/webroot/index.php
	lib/Cake/Console/Templates/skel/webroot/test.php
	lib/Cake/Controller/Component/AuthComponent.php
	lib/Cake/Controller/Component/EmailComponent.php
	lib/Cake/Controller/Component/PaginatorComponent.php
	lib/Cake/Controller/Component/RequestHandlerComponent.php
	lib/Cake/Core/App.php
	lib/Cake/Core/Configure.php
	lib/Cake/Core/Object.php
	lib/Cake/Core/Plugin.php
	lib/Cake/Error/ErrorHandler.php
	lib/Cake/Error/ExceptionRenderer.php
	lib/Cake/Error/exceptions.php
	lib/Cake/I18n/L10n.php
	lib/Cake/Log/CakeLog.php
	lib/Cake/Log/Engine/FileLog.php
	lib/Cake/Model/Behavior/TranslateBehavior.php
	lib/Cake/Model/Datasource/Database/Mysql.php
	lib/Cake/Model/Datasource/Database/Sqlite.php
	lib/Cake/Model/Datasource/Database/Sqlserver.php
	lib/Cake/Model/Datasource/DboSource.php
	lib/Cake/Model/Datasource/Session.php
	lib/Cake/Model/Datasource/Session/SessionHandlerInterface.php
	lib/Cake/Model/ModelValidator.php
	lib/Cake/Model/Validator/ValidationSet.php
	lib/Cake/Network/Email/Email.php
	lib/Cake/Network/Request.php
	lib/Cake/Routing/DispatcherFilter.php
	lib/Cake/Routing/Route/Route.php
	lib/Cake/Routing/Router.php
	lib/Cake/Test/Case/Core/CakePluginTest.php
	lib/Cake/Test/Case/Log/CakeLogTest.php
	lib/Cake/Test/TestCase/Console/Command/Task/TestTaskTest.php
	lib/Cake/Test/TestCase/Controller/Component/PaginatorComponentTest.php
	lib/Cake/Test/TestCase/Controller/ControllerTest.php
	lib/Cake/Test/TestCase/Error/ErrorHandlerTest.php
	lib/Cake/Test/TestCase/Model/ModelIntegrationTest.php
	lib/Cake/Test/TestCase/Network/ResponseTest.php
	lib/Cake/Test/TestCase/Routing/Route/RouteTest.php
	lib/Cake/Test/TestCase/Routing/RouterTest.php
	lib/Cake/Test/TestCase/View/Helper/FormHelperTest.php
	lib/Cake/Test/TestCase/View/Helper/PaginatorHelperTest.php
	lib/Cake/Test/TestCase/View/ViewTest.php
	lib/Cake/TestSuite/ControllerTestCase.php
	lib/Cake/TestSuite/TestCase.php
	lib/Cake/TestSuite/templates/header.php
	lib/Cake/Utility/Debugger.php
	lib/Cake/Utility/Hash.php
	lib/Cake/Utility/Number.php
	lib/Cake/VERSION.txt
	lib/Cake/View/Helper/PaginatorHelper.php
	lib/Cake/View/View.php


	See: cakephp/cakephp@f475e7857f8b40c9095de830ad5da415804c542e
Merge pull request #1073 from cakephp/issue-3533

Partially revert default niceShortFormat

The changes introduced in 2.2 dramatically changed the output from 2.1, this change attempts to be a compromise between the 2.1 format and the 2.2 format.

Fixes #3533

	See: cakephp/cakephp@70171f5403551b2b94b0e38830f1d4ab3ea1c27c
Merge pull request #1039 from bfanger/master

Fixes an issue with urls as GET parameters

	See: cakephp/cakephp@acc6a2645fee1da0bc2b911c3caa17c6047d8a9f
Remove Security.level from core.php

it's not used by cake, and it can confuse users familiar with 1.3
that this setting exists yet doesn't do anything in later versions


	See: cakephp/cakephp@51946ff8fd013a21514ed0e93e8d9245c38a3e31
Merge pull request #1082 from ADmad/bugfix-3560

Don't set "required" attribute for checkboxes (unless explicitly specifi...

	See: cakephp/cakephp@a03cbddf76840cf49d07f0f410b1eac873a322df
Merge pull request #1083 from ceeram/2.3-pmdvars

Remove unused local vars.

	See: cakephp/cakephp@6ade91e83b6c63e6cafb42dc71fca3a4a883a1bf
Merge pull request #1084 from petteyg/bakedbtabspace

Remove some spacial overkill

	See: cakephp/cakephp@d6e2d3822528b90fba69bd7cd3a3b5630bb4d17e