removed direct token support, but fully delegated to entity properties
Merge pull request #17 from ZoetropeImaging/feature/tokens

removed direct token support, but fully delegated to entity properties