[PLINK-522] - Token Identity Store.
Merge pull request #364 from pedroigor/master

[PLINK-522] - Token Identity Store.