Bug 1044405 - Should set a empty string if there are no text and l10nid provided
Bug 1039219 - Migrate all snippets for preferences in Makefile to preferences.js r=gduan

Conflicts:
	build/preferences.js
Bug 1048021 - Mass replace pageX and pageY to clientX and clientY for keyboard app.
Merge pull request #21809 from yurenju/preferences

Bug 1039219 - Migrate all snippets for preferences in Makefile to preferences.js r=@gduan
Merge pull request #22666 from crh0716/1044405

Bug 1044405 - Should set a empty string if there are no text and l10n provided. r=alive
Bug 1048025 - Set pointer-events: none on child elements of keys
Merge pull request #22699 from timdream/keyboard-vwrapper-css2

Bug 1048025 - Set pointer-events: none on child elements of keys, r=rudyl
Merge pull request #22681 from nmunro/master

Bug 1048021 - Mass replace pageX/pageY to clientX/clientY for keyboard app, r=timdream
Bug 1049439 - change appWindowManager from singleton to class

Conflicts:
	apps/system/js/statusbar.js
tests added
fix marionette tests