Upgrade to CakePHP 2.2+
Fix strict PHP warning
Remove unneeded comments
Merge branch 'feature-cakephp-2.4.1' into development