Dev cs

Updating coding standards according to CakePHP
via my Upgrade and CodeSniffer auto corrections.