<commit message>
Merge branch 'master' of https://github.com/webandappscompany/Zend_API_Categories