Tokens = Gems for front-end display.
Merge pull request #925 from SlappyBag/develop

Tokens = Gems for front-end display.