omit empty strings when serializing
Merge branch 'jsonempty' into dev

* jsonempty:
  Removing empty properties in toJSON()
Merge branch 'emptystring' into dev

* emptystring:
  omit empty strings when serializing