Changed CONTACT_MAIL_ADDRESS table to CONTACT_ADR to be consistent with
vcard spec naming and carried the change through as appropriate. Updated sql/php/tests.