formatting & phpDocs
cat helper conflict result
Merge branch 'master' of github.com:zuha/Categories-Zuha-Cakephp-Plugin
conflict fix in CategoryHelper