Merge pull request #364 from pedroigor/master

[PLINK-522] - Token Identity Store.
Minor changes:Added JavaDocs, resolved generics and refactored PL JSON.
Merge pull request #365 from girirajsharma/master

Minor changes:Added JavaDocs, resolved generics and refactored PL JSON.