update documentation and user token definition
Merge branch 'develop'