Bug 871909 - Importing contacts from sd card has problem with accented names [r=arcturus]
 Bug 835991 - change an l10n ID to make sure the translations are updated
Bug 866484 - [WiFi] Use shared code for settings
Merge pull request #9684 from Rik/update-xml-404-862785

Bug 862785 - no error message is shown when the update.xml url leads to a 404 error, r=kaze
Bug 862785 - No extra space for anonymous functions shame=rik
Bug 872445 - gaia-unit-tests TEST-UNEXPECTED-FAIL | Recipients List Recipients | expected undefined to be truthy r=gnarf

* removed the require for load_body_html_helper.js as we do it in setup.js now
* renamed the mocks helper to have a unique mocks helper var
Merge pull request #9790 from fabi1cazenave/l10n-crashReporting-bug835991

 Bug 835991 - change an l10n ID to make sure the translations are updated, r=pike
Merge pull request #9787 from comoyo/vcard_qp

Bug 871909 - Importing contacts from sd card has problem with accented names [r=arcturus]
Merge pull request #9502 from gaye/bug-867040

Bug 867040 - Tap to create event on calendar day and week views
Bug 872608 - Turn unresponsive script dialog off when DEBUG=1 is true r=julienw
Merge pull request #9771 from lightsofapollo/use-moz-anon-again

Bug 872215 - Fix regression when mozAnon was removed.
Bug 861290 Unable to sign off from the e-mail account, after deleting previously imported contacts
Merge pull request #9772 from lightsofapollo/only-persist-existing

Bug 872220 - Only mark permanent errors on existing accounts r=gaye
Bug 867111 - Extract the tags screen functions into an object for reusing.
bug 853125 - only populate default alarm when first creating event
Merge pull request #9437 from mikehenrty/bug-853125

bug 853125 - only populate default alarm when first creating event
Merge pull request #9073 from mcirlanaru/bug_828237

Bug 828237 - [Keyboard] Switch to new keyboard layout if language is cha... r=@davidflanagan(cherry picked from commit 74e31735fc78bf550db1f6e2f00ba5e907357180)

change initialization and settings update logic r=@RudyLu
Merge pull request #9689 from davidflanagan/bug828237

Bug 828237 - changing language should also switch default keyboard r=@davidflanagan,@RudyLu
Bug 869219 - [SMS] Resend handler is bound unsafely r=gnarf37

Include support for multi-recipient.

This includes:

- Modifications to the Desktop Mock (bringing the `delete` and
  `sendMessage` implementations closer to spec)
- An update to MessageManager that promotes compatability with the
  recent multi-recipient work
Bug 870177 - [SMS / MMS] behavior when character limit of SMS is reached V1.1 r=julienw r=djf

Adds Compose.type - 'sms' or 'mms'
Adds a 'type' event to Compose that is cancelable and called when the type switches
Adds a banner message for when the type switches
Changes logic for dealing with SMS segments to just switch Compose.type to mms when you go over and forces type to stay mms while you stay over the segment limit.
Adds a temporary bit of text saying MMS (Visual Design for an MMS corner banner will happen later)