implemented that properties are only updated, if values changed. Implemented special handling of null-fields in merge
Merge branch 'newmaster'