Upgrade to CakePHP 2.2+
Merge branch 'feature-cakephp-2.4.1' into development