Fix method signatures
Merge remote-tracking branch 'origin/master' into feature-cakephp-2.4.1
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master' into development
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
Fix reference to app's style.css file
Remove $this->fetch('script'); and reformat

Calling scripts before jQuery was loaded was causing errors
Merge branch 'development' into feature-cakephp-2.4.1
Fix strict PHP warning
Merge branch 'development'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master' into development
Merge branch 'development'