category api
Merge branch 'ninja' of github.com:imagecms/ImageCMS into ninja
category api