Bug 984604 - Running without --restart when FTU is open does not work
Bug 984399 - Contacts list is not properly updated when importing a new FB Friend
Bug 969101: Initial implementation of a first-time use ping. r=fabrice
 Bug 971459 - [System2] Instantiable Applications.
Bug 988754 - Fix test_call_contact.py
Bug 976248 - Colemak keyboard layout added
Merge pull request #17702 from comoyo/colemak

Bug 976248 - Colemak keyboard layout added. r=janjongboom
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
Merge pull request #17693 from yurenju/stage-windows-squash-3

Bug 897352 - [gaia build system] Transition to a build_stage for assembl... r=@ochameau
Bug 885545 - Create Blobs for Contact photos in the VCF importer
Merge pull request #17520 from sergi/885545-photo-blob

Bug 885545 - Create Blobs for Contact photos in the VCF importer
Revert "Bug 897352 - [gaia build system] Transition to a build_stage for assembling apps" build failure

This reverts commit c965501afb3849cb1b10b0738c86fe9e450e8b9a.
Merge pull request #17325 from AndreiH/bug_984604_2

Bug 984604 - Running without --restart when FTU is open does not work, r=davehunt
Merge pull request #17689 from askeing/988754

Bug 988754 - Fix test_call_contact.py
Bug 988848 - Documentation for gaia-marionette is wrong. r=21
Merge pull request #17639 from mpizza/Bug_971459_landed_IN_master

 Bug 971459 - [System2] Instantiable Applications. r=alive.
Bug 987946 - [unittest] test_cold_launch.py failing

The test is failing because the correct app url is now not available until
shortly after launching.
This patch changes the test so it waits for the correct app url, rather than
just immediately asserting that it is as expected.
Merge pull request #17604 from bobsilverberg/cold_launch

Bug 987946 - [unittest] test_cold_launch.py failing
Revert "Merge pull request #17576 from Rik/sms-send-button-907103"

This reverts commit a3d4a9e35c5e5f25d4ab6035aebf422f09938688, reversing
changes made to 24f53ad7eb48c6e773413687fa76c81983f926f3.
Bug 971459 - [System2] Instantiable Applications r=me