Merge pull request #7 from Roll20/master

update
updated JSON

userid
Merge pull request #153 from alicia86/master

updated JSON