CakePHP 2.3 fixes
Merge pull request #2 from Diamons/master

CakePHP 2.3 fixes