fixed bug with multiple entities on one token
Merge branch '432-create-entity-occurrence' into develop