added token input for category
Merge branch 'token_input'