Fix docblock typo of ObjectCollection class
Merge pull request #1204 from bcrowe/master

Fix docblock typo of ObjectCollection class
spelling correction.
Fixing tag generation for Html::script() and Html::css() when using 'fullBase' => true.

Changing values on array_diff_key() from empty ('') to null as they have no consequences and offer better readability.
Merge pull request #1207 from renansaddam/supportFullBaseOnScriptAndCss

Fix missing support for fullBase in script() & css()

HtmlHelper::script(), HtmlHelper::css() did not have support for fullBase
added when it was added to image(). Fix that omission.
Merge pull request #1203 from cincodenada/patch_httpsocket

Add a bit of backwards compatibility for specifying auth in the config.

Restore compatibility with older versions when providing auth data in the
request data.
Try to fix random test failures on postgres.

Sorting in postgres is undefined and no based on the primary key when
sorting is not supplied.
Fallback to the default renderer if the config key is missing.
Fix CS error
Make JS,CSS,IMAGES conditionally defined.

This allows app's to redefine these constants as necessary.
This makes these constants consistent with their *_URL relatives.
Fixes #GH-1170
Remove pointless code.

Add a missing call to parent::setUp() and remove code that it takes
care of.
Fixing comment for  in TimeHelper __construct
Merge pull request #1215 from andreaskri/timelinehelper_comment_fix

Fixing comment for  in TimeHelper __construct
Fix array('disabled') and array('disabled' => true) working differently.

The shortform should work the same as the longer form with regards to
disabling field locking with SecurityComponent.

Fixes #3734
Improved docblocks
Tweak docblock for api generator
docblock tweaks for apigen
Update version number to 2.3.2
Replace node.js with lighthttpd to avoid socket exceptions
Merge pull request #1222 from ceeram/2.3-travisnode

Replace node.js with lighthttpd to avoid socket exceptions