enforce a better email wrapping to send valid emails
do not translate error message in test case
Fix typo variable name in _deleteDependent().

It's not a big deal but there was a typo in _deleteDependent() method. 

$savedAssociatons instead of $savedAssociations.
Merge pull request #1309 from damien-biasotto/patch-1

Fix typo variable name in _deleteDependent().
Fixed or removed some package/subpackage definitions to reflect directory structure

Lowercase cake instead of Cake
Tests instead of Test
Fixtures instead of Fixture
Renamed ...Controller package to ...View

Probably a leftover from splitting in https://github.com/cakephp/cakephp/commit/09e7f1d491764b92db367b3442d0a6363f9e88e4
Merge pull request #1311 from ravage84/patch-4

Fixed package name in docblock
Merge pull request #1312 from ravage84/package-fixes

Fixed or removed some package/subpackage definitions to reflect director...
Synced PHP version annotations

CakePHP seems to be just "PHP 5" as opposed to the PEAR header comment standard "PHP version 5"
http://pear.php.net/manual/en/standards.header.php
Merge pull request #1313 from ravage84/php-version-annotations

Synced PHP version annotations
Improved the DocBlocks and other code cleanup

Fixed @license tag, url comes first
Whitespace and other minor code cleanup
Added some docblocks
Merge pull request #1297 from dereuromark/master-email-wrapping

enforce a better email wrapping to send valid emails
Merge pull request #1320 from ravage84/docblock-improvements

Improved the DocBlocks and other code cleanup
Fix coding standards.
Merge branch 'master' into 2.4

Conflicts:
	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.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/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/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/View/Layouts/flash.ctp
	lib/Cake/Console/Templates/skel/View/Pages/home.ctp
	lib/Cake/Console/Templates/skel/index.php
	lib/Cake/Console/Templates/skel/webroot/index.php
	lib/Cake/Console/Templates/skel/webroot/test.php