Merge branch 'master' of github.com:cakephp/cakephp
Fix testSendRenderWithImage when non running on port 80
Make sure the environment variable is set
Change to match coding standards
Merge pull request #796 from MrRio/ticket-3152

Fix Email test fails when not running on port 80  

Fixes #3152
partial remove onlyAllow from baked code, only keep in delete to be rfc compliant
Update API docs.
Clarify docs.
Fix whitespace.
Fix blackhole requests with empty select boxes.

When a select box was entirely empty (no option element)
secured form submission should not fail.

Fixes #3153
remove settings parameter from initialize as this is not being passed. only the constructor gets settings passed
Add plugin support to IniReader, and harden tests.
The actual config file must always have .ini extension.
For backwards compatibility, acl.ini.php will be treated specially until 3.0.
Fix unescaped entities.
Merge pull request #798 from ceeram/2.3-initialize

remove settings parameter from initialize as this is not being passed. o...
Merge pull request #773 from bar/master-fix-inireader

Add plugin support to IniReader, and harden tests.
Move OptionParser initialization out of try block.

This allows exceptions that result from creating the optionparser to
display to the developer, making debugging easier.

Fixes #3157
Make invalid short option error more helpful.

Refs #3157
Refactor Validator::decimal() to be more flexible with decimal
separators and PHP magic.
Lots of testing added.
Merge pull request #800 from bar/master-validator-decimal

Refactor Validator::decimal() to be more flexible with decimal separators and PHP magic. Lots of testing added.
Ignore non-scalar values for length.

Fixes #3159