Bug 824625 - Make "Sample Format" label localizable
Bug 820145 - Update icons

Changes the edit icon into a edit mode type of icon.
Adds a compose icon as the old edit icon.
Adds an edit contact icon.
Bug 826872 - Incrementally Parse XML/ICAL fix mem-leak in icalComponents
Bug 805192 - Remove mozilla preset
Bug 824597 - Close the pair view when users press the home button while pairing
Merge pull request #6767 from lightsofapollo/remove-mozilla-preset

Bug 805192 - Remove mozilla preset (don't merge this yet)
Merge pull request #7225 from crh0716/824597

Bug 824597 - Close the pair view when users press the home button while pairing r=evelyn hung, a=bb+
Bug 827137 - Cost control running with foreground priority when not visible (again)
Merge pull request #7317 from KevinGrandon/bug_820145_new_icons

Bug 820145 - Update edit/compose icons
Merge pull request #7318 from vingtetun/827137

Bug 827137 - Cost control running with foreground priority when not visi...
Merge pull request #7311 from timdream/settings/sample-format

Bug 824625 - Make "Sample Format" label localizable, r=evelyn, pike, a=blocking-basecamp
Merge pull request #7313 from lightsofapollo/calendar-cjones-oom

Bug 826872 - Incrementally Parse XML/ICAL fix mem-leak in icalComponents
Bug 825017 - [B2G][FTE] The import Facebook contacts button now works correctly

fixes

Fix

Display logic fix in fb-ftu button

Forget the wifi on startup of ftu

cleaning
Merge pull request #7230 from michalbe/fb-button-ftu

Bug 825017 - [B2G][FTE] The import Facebook contacts button now works co...
Bug 826112 - record connected device by using asyncStorage
and restore the connection when bluetooth is turned on again.
Merge pull request #7320 from evelynhung/issue-826112

Bug 826112 - record connected device by using asyncStorage
Merge remote-tracking branch 'upstream/master' into ux

Conflicts:
	apps/email/index.html
	apps/sms/index.html