#1 - implement ticket category token
Merge remote-tracking branch 'origin/master'