Resolver organizations categories
Merge branch 'mat pullster' of github.com:rcanepa/simpleclerk