Use id() as VERSION doesn't exist in phpunit 3.6
Merge branch 'master' into 2.3

Conflicts:
	lib/Cake/Event/CakeEventManager.php
	lib/Cake/VERSION.txt
	lib/Cake/View/ViewBlock.php
Fix missed use of VERSION.
Merge branch 'master' into 2.3
Try to make tests less fragile.
Swap isset() for array_key_exists()

Fixes #3283
allow ini files to have separators between sections for better readability

dump now makes spaces between sections in init files
Force field validation to use sha1

When using blowfish as your application's hashing strategy, form field
validation would fail horribly.  Forcing sha1 fixes this and restores
behavior consistent with 2.2.x

Fixes #3280
Fix issue with using contain() and query[contain]

When contain() and query['contain'] = array(...) were used together
the query['contain'] values where not respected.

Fixes #3287
Fix saveAssociated() with validate=first, atomic=false

When using the above options & validation errors on the associated
models, saving would not be aborted.

Fixes #3285
Merge branch 'master' into 2.3

Conflicts:
	lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php
Remove bad test.
Fixed problems with resetSequence() not using the correct sequence name
in postgres
use the right language domain

these messages are for developers, not end users
Correct inflection rules for cookies, fixes fixes #3291
Pushed before fxing error in test case, I suck. Refs #3291
Fix issue where createSchema() would omit primary keys sometimes.

Fix missing primary key SQL when using the primary flag + other indexes.

Fixes #3292
Remove bad test.
Merge pull request #905 from dereuromark/2.3-ini

allow ini files to have separators between sections for better readability
Merge pull request #894 from dereuromark/comp-fix-save-all

BC mod for saveAll()