Correct doc blocks
Merge pull request #3247 from cakephp/master-docblocks

Correct doc blocks
Merge branch 'master' into 2.5
Merge branch '2.5' of github.com:cakephp/cakephp into 2.5