Bug 969101: Initial implementation of a first-time use ping. r=fabrice
Bug 978783 - SV: Data enabled/disabled by default during FTU customized by SIM
Bug 990002 - Move import utilities to shared folder
Bug 930364 - standard text message sound is jarring
Revert "Merge pull request #16262 from benfrancis/959694-master"
Merge pull request #17961 from marshall/ftuPing

Bug 969101: Initial implementation of a first-time use ping. r=fabrice
Merge pull request #17995 from sfoster/backout-959694

Revert "Merge pull request #16262 from benfrancis/959694-master"
Merge pull request #17994 from Rik/sms-sound-930364

Bug 930364 - standard text message sound is jarring r=julienw
Revert "Bug 984572 - JSHint fixes for js/*, js/utils and js/worker."

This reverts commit 1b0f1abf64059b88b33f7312f82d722e33e98cac.

Conflicts:
	build/jshint/xfail.list
Bug 992466 - Phone wont come back from sleep on ftu
Edit for readability

It was missing a few things.
Merge pull request #17999 from richierichrawr/patch-1

Edit tablet customization doc for readability r=kgrandon
Merge pull request #17346 from mcjimenez/bug978783_v2

Bug 978783 - SV: Data enabled/disabled by default during FTU customized by SIM
Bug 971538 - [System2] Instantiable PermissionManager

- rename currentPermission to permissionType
Merge pull request #18003 from gasolin/issue-971538

Bug 971538 - [System2] Instantiable PermissionManager, r=alive
Merge pull request #17896 from fcampo/split-fte-comms-990002

Bug 990002 - Move import utilities to shared folder (r=jmcf,arcturus, etienne)
Bug 992644 - EverythingME.log: Bind to window.console object [r=ranbena]
Merge pull request #18004 from EverythingMe/992644-console-binding

Bug 992644 - EverythingME.log: Bind to window.console object [r=ranbena]
Bug 897352 - [gaia build system] Transition to a build_stage for assembling apps

Conflicts:
	Makefile
	apps/communications/build/build.js
	build/copy-build-stage-manifest.js
	build/test/integration/distribution.test.js
	build/utils-xpc.js
	build/utils.js
	build/webapp-manifests.js
Bug 991585 - NFC: NfcUtils.encodeHandoverSelect is not a function. r=alive