vcard cleanup (replace ITEMX.ADR by ADR)
Merge remote-tracking branch 'pullr1/master'