Bug 729963 - Include SIP, IM and TEL while merging contacts + Allow to select GivenName, FN