Updated doc blocks
Merge branch '2.5' of github.com:WyriHaximus/cakephp into 2.5