Improved docblocks
Tweak docblock for api generator
Merge branch 'master' into 2.4

Conflicts:
	lib/Cake/Model/Model.php