housekeeping
missing rename
resolve conflict
Merge pull request #18 from plone/rnixx_single_valued_relation_field

housekeeping