Merge branch 'master' into 1.6

Conflicts:
	Croogo/Test/Case/View/Helper/CroogoFormHelperTest.php
Fix E_STRICT errors for behaviors added in 1.6

Continuation from: ecc69b7234
See: cakephp/cakephp#1623
Trackable: Fix when used in inherited model and saveField()