Bug 838011 - Add email address to contacts
Merge pull request #8596 from crh0716/838011

Bug 838011 - Add email address to contacts. r=asuth, albertopq. a=leo+