Client Merge Wizard; show Addresses and Contact Methods from both Clients and allow to be marked as Current or Historic

The Client Merge Wizard now shows Addresses and Contact Methods from both Clients and allows them to be marked as Current or Historic.

All addresses and contacts not already in the Main Client will be added.

Where the "Use" column is checked items are marked as Current, where unchecked they are marked as Historic.