Bug 885546 - VCF importer saves type="UTF-8" in contact fields [r=arcturus]
Merge branch 'vcard_utf8' of https://github.com/comoyo/gaia into vcard_utf8

Conflicts:
	apps/communications/contacts/test/unit/vcard_parsing_test.js