Adding tokens
Merge branch 'plus-3.2' of https://github.com/NCIP/catissue-core into plus-3.2