Merge remote-tracking branch 'origin/master' into feature-cakephp-2.4.1
Add default error layout

New in CakePHP 2.2
Upgrade to latest version

Necessary to be compatible with CakePHP 2.4
Eliminate strict PHP warning
Merge branch 'development' into feature-cakephp-2.4.1
Fix strict PHP warning