Migrate master branch to CakePHP 2.x