IDEX-483 add 'category' to project type
Merge remote-tracking branch 'origin/master'