updates to JSON
Merge branch 'master' of https://github.com/NetTango/NetTangoJS