add test and remove debug code
rename JSON => Object type.  Add ObjectSet
Merge branch 'json' into dev

* json:
  rename JSON => Object type.  Add ObjectSet
  add test and remove debug code