Fix group name generation when setting labels
Fix empty ORG property

ORG was being set empty if no organization/department was specified
Fix two problems with addresses

Addresses were being duplicated when saving a contact, and their labels weren't
being set.