Refactor token architecture for clarity and consistency#112

jaymantri merged 1 commit intomainlightsparkdev/origin:mainfrom

refactor/token-architecturelightsparkdev/origin:refactor/token-architectureCopy head branch name to clipboard