Merge pull request #1050 from dfinity/replace-token-with-app

Merge pull request #1050 from dfinity/replace-token-with-app #1459