Merge pull request #10408 from mcirlanaru/bug_881904

Bug 881904 - [Contacts] Use the text normalizer from shared/js, r=@albertopq(cherry picked from commit 9b3cf4d68c2097c6060c3e76c0194c0e115411b7)

Conflicts:

	apps/communications/contacts/js/contacts.js
	apps/communications/contacts/js/fb/friends_list.js
	apps/communications/contacts/js/utilities/normalizer.js
	apps/communications/contacts/test/unit/contacts_list_test.js
	apps/communications/contacts/test/unit/link_test.js
Bug 883834 - Touch events position is wrong on desktop when a DOM element is scrollable
(cherry picked from commit f2e1981e5ac09b72e1e8ffcbc0f5f6c42cb92037)
Bug 890079 - Homescreen grid tests failing in TBPL with: document.createTouch is not a function r=crdlc a=npotb

don't try to send touch events if document.createTouch is missing.
(cherry picked from commit 3f51aa0913ad86b50abd97d2b25e07b59677708c)
Bug 878820 - Contacts imported from VCF files disappear [r=arcturus]

- Using mozContacts now
- Isolated functionality to make it easier to test
- Added Unit tests

Conflicts:
	apps/communications/contacts/js/utilities/vcard_parser.js
	apps/communications/contacts/test/unit/vcard_parsing_test.js
Bug 886992 - vcard_parsing_test.js has two failing tests [r=arcturus]
Bug 885546 - VCF importer saves type="UTF-8" in contact fields [r=arcturus]
Merge pull request #10799 from mozilla-b2g/fix_vcard

Bug 878820 - Contacts imported from VCF files disappear
Bug 887737 - [SMS] The device is not recognizing the phone number received completely - r=julienw

* Rewrite the phone number matching regexp
* Include all the fixtures from Utils tests in FixturePhones and include in setup so we can share test cases
(cherry picked from commit 9e7768c2ccd985923e00c9d90aa3f92dfa771913)
Bug 874000 - (mmi-result-pin) [MMI] Use MMIResult for PIN/PIN2/PUK related functionality. r=rik
(cherry picked from commit 4232b08531de197b619797c1467e49a9157963aa)
Bug 879680 - (mmi-result-cf) [MMI] Use MMIResult for Call Forwarding related functionality. r=ferjm
(cherry picked from commit 7f3e1fa0204afc369e91fe3f619388781a2279fb)
Bug 890428 - [l10n][fr] Update fr locale on Github for dev testing
Merge pull request #10813 from TheoChevalier/update-fr-v1-train-2

Bug 890428 - [l10n][fr] Update fr locale on Github for dev testing, r=kaze
Bug 877482 - Remove workaround for bug 850941 to properly handle file-backed blobs
Merge pull request #10817 from gabrielesvelto/bug-877482-v1-train

Bug 877482 - Remove workaround for bug 850941 to properly handle file-backed blobs r=djf
Merge pull request #10491 from arcturus/bug-880624

Bug 880624 - [MMS/SMS] The dialog when tapping on a contact into ‘To’ field is not correct(cherry picked from commit 72565090cb39dc65d136027769018a76cd61041b)

Conflicts:
	apps/sms/index.html
	apps/sms/js/startup.js
	apps/sms/test/unit/mock_utils.js
	apps/sms/test/unit/utils_test.js
Merge pull request #9548 from jrburke/bug809791-menu-gutter

Bug 809791: email: fix menu icon in header during folder transition r=asuth
(cherry picked from commit cf64ad76a35f980eeb26d31e5aa0891bbf2b4247)
Bug 870416 - [MMS] Recipients container multiline view takes all available space

- When the screen resizes, generate a CSS rule that calculates the max available height
- Renames an existing element to match the naming convention
- Adds non-html interpolation support to the template matcher regexp
- Ensures that assimilations abide existing behavior rules

https://bugzilla.mozilla.org/show_bug.cgi?id=870416
Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
(cherry picked from commit bebbeefa1ddf854b537c50f27a924e76dabc574d)
Merge pull request #10635 from comoyo/retry_pin_code

Bug 887190 - Upon introducing wrong PIN code, focus and keyboard go away and the user can't try it again
(cherry picked from commit 77874b0313784ea0e1519c5df5790d7501bc3d1c)
Merge pull request #10740 from jmcanterafonseca/patch_wlive

Allow customization for Windows Live Application Id
(cherry picked from commit d463818bd666fe53e10e828a842b7f48693ccd7b)
Merge pull request #10745 from lodr/bug-889367-movistar-peru-configuration

Bug 889367 - Movistar Peru configuration file
r=arcturus
(cherry picked from commit a19f1481e5cb0aea58e0a938aee6fe2c566a7682)