Contacts now have phone numbers.
Merge branch 'tp'