Merge pull request #1283 from yupe/dev

UPD: small fixes usertokens doc