Bug 852361 - [System] When battery level become two percents, device is shut down
bug 865276 Remove old version of maps from repo; The latest version should be added as a custom app in the distribution file created for a specific release
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 877960 - followup to fix UX stepbar (r=fabrice)
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