Fixing a couple bugs in import/export.
Removing [DataMember] attribute usage on known potential circular references.
Merge branch 'develop' into bug-jo-export