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.
Added test changes lost in previous commit.
Merge branch 'master' into vcardToolsRefactor
Changed CONTACT_PHONE_NUMBER to CONTACT_TEL for consistency with VCard spec and
carried through appropriately, editing sql, php, tests.
Renamed EMAIL_ADDRESS column to just EMAIL for consistency.
Renamed CATEGORY_NAME to CATEGORY, for consistency.