updated token data
Merge branch 'develop'