Bump version for 2.6.0-dev.
Updated documentation
* Removed references to nonexistent `AclBase` class
* Added references to `AclInterface` requirements
Merge pull request #3297 from young-steveo/AclComponent-documentation-fix

Updated AclComponent documentation
Trim $sql before checking for SELECT
Merge pull request #3301 from ubermaniac/Sqlserver-trim

Trim $sql before checking for SELECT
Correct types for Validation::range().

Refs #3304
Don't 404 extensions that could be handled by routing.

Fixes an error in #2750 where routed extensions would always return
404's for plugin requests. When a file extenion could be handled by
router, AssetDispatcher cannot 404 the request.

Refs #3305
Revert changed added in #2750.

While the had the potential to make 404s going through AssetDispatcher
much faster, they broke plugins + extension routing. While explicit
extensions could be fixed, routing all extensions could not. Because we
are trying to keep 2.x as API compatible as possible it makes sense to
revert the previous changes.
Add newline after actions in controller template
Fix failing NoActions comparison test
Merge pull request #3308 from cakephp/asset-dispatcher-fix

Don't 404 extensions that could be handled by routing.
Merge pull request #3316 from bcrowe/hotfix-controller-template

Add newline after actions in controller template
Fix closing non resource

I get a load of these errors when running tests in the shell, this check stops the errors from happening

Warning: 2 :: fclose() expects parameter 1 to be resource, integer given on line 298 of CORE\Cake\Console\ConsoleOutput.php
Trace:
fclose - [internal], line ??
ConsoleOutput::__destruct() - CORE\Cake\Console\ConsoleOutput.php, line 298
ToolbarComponent::_saveState() - APP\Plugin\DebugKit\Controller\Component\ToolbarComponent.php, line 307
ToolbarComponent::beforeRedirect() - APP\Plugin\DebugKit\Controller\Component\ToolbarComponent.php, line 307
ObjectCollection::trigger() - CORE\Cake\Utility\ObjectCollection.php, line 132
call_user_func - [internal], line ??
CakeEventManager::dispatch() - CORE\Cake\Event\CakeEventManager.php, line 247
Controller::redirect() - CORE\Cake\Controller\Controller.php, line 765
AuthComponent::_unauthenticated() - CORE\Cake\Controller\Component\AuthComponent.php, line 364
AuthComponent::startup() - CORE\Cake\Controller\Component\AuthComponent.php, line 304
ObjectCollection::trigger() - CORE\Cake\Utility\ObjectCollection.php, line 132
call_user_func - [internal], line ??
CakeEventManager::dispatch() - CORE\Cake\Event\CakeEventManager.php, line 247
Controller::startupProcess() - CORE\Cake\Controller\Controller.php, line 675
Dispatcher::_invoke() - CORE\Cake\Routing\Dispatcher.php, line 182
Dispatcher::dispatch() - CORE\Cake\Routing\Dispatcher.php, line 160
Merge pull request #3319 from dogmatic69/patch-1

Fix closing non resource
Merge branch 'master' into 2.5
Merge branch '2.5' into 2.6
Merge remote-tracking branch 'origin/2.6' into 3.0

Conflicts:
	VERSION.txt
	lib/Cake/Model/Datasource/Database/Sqlserver.php
	lib/Cake/Test/Case/Routing/Filter/AssetDispatcherTest.php
	src/Controller/Component/AclComponent.php
	src/Routing/Filter/AssetDispatcher.php
	src/Validation/Validation.php