Bug 935636 - Avoid duplicating data on contact merge
Merge branch 'master' of github.com:mozilla-b2g/gaia into Bug935636
[GAIA BUG935636] - change in vcard parser
[GAIA BUG935636] - change in vcard parser (lint fixes)
Merge pull request #353 from michalbe/Bug935636-temp

[GAIA BUG935636] - change in vcard parser