Bug 824835 - Display the location info for the events which is cross the next day.
Bug 864699 - FTU need tests: Added test for SIM Management
 Bug 831228 - proper l10n init in Settings > Cellular & Data > Network Operator
Bug 829023 - [Settings] Don't use dividers to separate paragraphs in the same text block

Conflicts:
	apps/settings/index.html
Bug 877595 - Make mozContacts works again with the browser-helper extension
Bug 877166 - [SMS][Regression] Delete button is not disabled when no item is selected
Bug 871450 - [Email] Cached contact info is not automatically updated by notifications from the mozContacts API; stale info can be shown. r=squib
Merge pull request #10118 from asutherland/email-update-contacts

Bug 871450 - [Email] Cached contact info is not automatically updated by notifications from the mozContacts API; stale info can be shown. r=squib
Bug 875641: update MediaDB and Gallery to handled SD card removal and sharing when there is also internal storage
Merge pull request #10136 from davidflanagan/bug875641

Bug 875641: update MediaDB and Gallery to handled SD card removal and sharing when there is also internal storage r=dhylands
Bug 870327: handle new MediaDB cardremoved event to stop playing
Merge pull request #10056 from davidflanagan/bug870327

Bug 870327: fix crash if sdcard is pulled while music is playing r=dkuo
Bug 826071 - Notify user when they receive new emails
Merge pull request #9939 from gaye/bug-826071

Bug 826071 - Notify user when they receive new emails r=asuth
Bug 878326: do not crash when removing sdcard during video playback
Merge pull request #10141 from davidflanagan/bug878326

Bug 878326: do not crash when removing sdcard during video playback. r=daleharvey
Bug 860605 - [Email/IMAP] Initial synchronization is too conservative on time windows, especially when the folder has a small number of messages. rs=squib

land https://github.com/mozilla-b2g/gaia-email-libs-and-more/pull/215
Merge pull request #10143 from asutherland/email-faster-deepening

Bug 860605 - [Email/IMAP] Initial synchronization is too conservative on time windows, especially when the folder has a small number of messages. rs=squib
Bug 876597 - Disable the power button when the airplane mode is on
Merge pull request #10051 from crh0716/876597

Bug 876597 - Disable the power button when the airplane mode is on