Comoyo vcard import2 rebased [do not merge]