Remove unnecessary templates for marlin2
Add single template that allows xlinking of contacts
(more work to come on new template)
Don't expand party element - allows xlink selection