Add missing return tags
Merge pull request #2135 from bcrowe/htofix-returndocs

Add missing return tags
Add test cases for pluralization/singularlization of quota.

Closes #2077
include calls without parentheses

Refs https://github.com/cakephp/cakephp/pull/1698/files#r6748085
Merge pull request #2140 from ravage84/include-parentheses

include calls without parentheses
Change is_null() calls to strict checks
Change is_null() calls to strict checks in CakeSchema::_arrayDiffAssoc()
Merge pull request #2142 from bcrowe/hotfix-strictNull

Change is_null() calls to strict checks
Remove extra space around the brace in CakeSchema::_arrayDiffAssoc()
Merge pull request #2143 from bcrowe/hotfix-extraSpace

Remove extra space around the brace in CakeSchema::_arrayDiffAssoc()
Readability update for Dispatcher::_invoke()
Merge pull request #2147 from bcrowe/hotfix-dispatcher

Readability update for Dispatcher::_invoke()
Add tests for curve<->curves

Closes #2148
Fix inflection rules for curves.

Remove curve from the uninflected list and update rules so it, wolves,
and lives are still properly handled.

Fixes #2148
Extract constantly-changing config files
Follows coding standards
Start making bake model work
Merge branch '3.0' of https://github.com/josephzidell/cakephp into 3.0

Conflicts:
	Cake/Routing/Dispatcher.php
	Cake/View/Helper/NumberHelper.php
	Cake/View/Helper/TimeHelper.php
	app/Config/bootstrap.php
	app/Config/core.php
	app/Console/cake.php
	app/webroot/index.php
	app/webroot/test.php
	lib/Cake/Console/Templates/skel/Console/cake.php
	lib/Cake/Console/Templates/skel/webroot/index.php
	lib/Cake/Console/Templates/skel/webroot/test.php
	lib/Cake/Model/CakeSchema.php
	vendor/cakephp/cakephp/tests/test_app/Plugin/TestPlugin/Console/Templates/empty