Merge branch 'develop'
update documentation and user token definition