Add short option for theme in BakeShell
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 #1310 from Jippi/hotfix/allow-bake-tasks-to-provide-theme-as-cli-option

allow bake tasks to provide theme as cli option
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
Update HttpSocket.php

Add 'allow_self_signed' SSL context option.
Update HttpSocketTest.php

Update tests.
Merge pull request #1316 from sarce/patch-2

Add 'ssl_allow_self_signed' option to SSL context in HttpSocket class.
Adding App.fullbaseURL as a recognized Configure value
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.
fix Form::_selectOptions, when disabled attribute is not array so do not be disabled  item of options
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
Merge pull request #1321 from zoghal/form-select-disabled

fix Form::_selectOptions, when disabled attribute is not array so do not...
Fix inconsistent name/alias usage.

TranslateBehavior should always use name instead of alias when
creating/updating/saving new translate records. It already uses name
when finding translations and the mismatch was causing translations to
not be found when saved from an aliased model.

Thanks to Joost de Keijzer for providing the initial patch.

Fixes #3865
docblock updates