disabled json saving until serialization is fixed
Enable some properties for editing.
Merge remote-tracking branch 'upstream/master'