Bug 988296 - imsSettings-header points to messageSettings, should be imsSettings ('Message settings' vs. 'IMS settings')
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 988362 - [STK]The maxlength of the inputbox didn't set corretly in GET_INPUT command. (Increment wait time)
Bug 930364 - standard text message sound is jarring
Bug 988079 - [Calendar] day view sometimes adds duplicated days to the DOM
Bug 980861 -[Cost Control] Alarm should be notified when user configures when use is above or when balance is below
Bug 969101: Initial implementation of a first-time use ping. r=fabrice
Bug 971554 - [System2] Instantiable SoundManager
 Bug 971459 - [System2] Instantiable Applications.
Bug 988261 - Hide utility tray on launchapp event
Bug 984265 - JSHint fixes for shared/js
Bug 963003 - Fix attention screen height on software home button shown
Bug 971512 - [System] Instantiable layout manager
Merge pull request #17578 from Rik/sms-sound-930364

Bug 930364 - standard text message sound is jarring r=julienw
Merge pull request #17641 from rexboy7/bug-971512-1.4

Bug 971512 - [System] Instantiable layout manager
Bug 971072 - [VDR] [BB] update modals with new Buttons BB
Merge pull request #17652 from rnowm/VR-modals

Bug 971072 - [VDR] [BB] update modals with new Buttons BB r=pivanov
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 #17674 from gitmai/bug-980861-balance-notification-without-sms

Bug 980861 -[Cost Control] Alarm should be notified when user configures...
r=salva