Bug 824835 - Display the location info for the events which is cross the next day.
Bug 876615 - Remove Vivo bookmarks in the browser
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 857901: Increase keyboard character-delete speed

UX informs me that 75ms seems to be a good interval, and that the
initial delay is fine where it is.
Bug 875248 - New unit tests for wallpaper.js
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 876145: fix authentication dialog in browser (wrong attribute)

Replace l10n-id with data-l10n-id in browser. As it is, the
authentication dialog's title is always displayed in English.
Bug 877960: followup to check the pref by default.
Merge remote-tracking branch 'upstream/master'
merge
Bug 869903 - Use black as the default background of packaged apps
Merge remote-tracking branch 'upstream/master'
Merge pull request #10119 from michaelwu/bug-869903

Bug 869903 - Use black as the default background of packaged apps
Merge remote-tracking branch 'upstream/master'
Bug 873407 - [Buri]Time on status bar won't update immediately when set time in Settings.
Bug 868902 - [Buri]data connection and hotspot still enabled without SIM
Merge pull request #10066 from huchengtw-moz/settings/Bug_868902_data_connection_and_hotspot_still_enabled

Bug 868902 - [Buri]data connection and hotspot still enabled without SIM, r=@alivedise