Refactored token types to use only 1 and not 3 fields
Merge branch 'dev' of github.com:djrieger/mjplusplus into dev