added zip template tag
displaying entity kind on tokens
Merge branch 'fix-multiple-eo-per-token' into relational-storage