big update of json files
Merge remote-tracking branch 'upstream/master' into update-endpoints
Merge pull request #9 from thomascrenshaw/update-endpoints

Update endpoints