Merge pull request #14418 from viorelaioia/bug_946666

Bug 946666 - Write a test for wakelock
Merge pull request #14015 from viorelaioia/bug_942220

Bug 942220 - Add explicit wait in tap_back in contact_details.py
Merge pull request #14544 from gaye/non-native-marionette

Use non-native marionette-js-runner for buildbot
Bug 948429 - Documenting the usage of Xvfb and keep tests quiet
Merge pull request #14535 from lissyx/bug948429

Bug 948429 - Documenting the usage of Xvfb and keep tests quiet r=gaye
Bug 946047: Add nfc read only permissions to Settings UI to allow navigator.mozNfc DOM to be created.

This fix is needed for apps using NFC if "HasNfcSupport" is added to the navigator MozNfc WebIDL.

Conflicts:
	apps/settings/manifest.webapp
Merge pull request #14518 from autonome/816133

Bug 816133 - Brightness default value should not be automatic
Merge pull request #14466 from Rik/fast-finish-travis-947295

Bug 947295 - Show Travis build as failing as soon as one job is failing
Merge pull request #14301 from crh0716/921390

Bug 921390 - Display operator name for each SIM on the lockscreen of DSDS devices r=alive
Bug 947810 - Show authentication information in WAP-Push test app. r=arthurcc
Bug 907013 - Implement AppWindowManager.

* Disable 3 marionette js tests because marionette seems having trouble on finding out alerts. Will file follow up bugs to re-enable them.
* Remove WindowManager and introduce AppWindowManager
* Introduce LayoutManager who knows and gethers the sizing info well.
* Fix OrientationManager issues.
* Abandon TransitionMixin and "Re"write an AppTransitionController for the use case of edge gesture -- let appWindow support multiple transitions.
* Abandon AuthenticationDialog and "Re"implement AppAuthenticationDialog
* AppWindow: Introduce subcomponents under appWindow
* AppWindow: Introduce broadcast for internal events, publish for external events.
* AppWindow: Introduce event handling mechanism by registeredEvents.
* Fix VisibilityManager issues.
* Change the mechanism in python based gaia-apps.
* More shared code between AppWindow and HomescreenWindow.
* More shared code between AppWindow and ActivityWindow.
* Add 100+ unit test functions.
* Isolate window.css from system.css
* Add a new event in KeyboardManager for continuos transition control.
* Add a developer settings for enabling simultaneous animation control.
* Add jsdoc support.
  http://alivedise.github.io/gaia-system-jsdoc/
Merge pull request #13797 from alivedise/bugzilla/907013_master_rebasing/app_window_manager_v3

Bug 907013 Implement AppWindowManager and bye bye WindowManager, r=etienne
Bug 945464 - [music] add will-animate to music app
Bug 948799 - Xfail test_cost_control_reset_wifi.py
Bug 948811 - Remove HTML in comments
Merge pull request #14527 from gitmai/bug-948304-remove-mindgap-reference

Bug 948304 - [Cost control] Remove reference to mindgap.js library
r=salva
Merge pull request #14532 from julienw/fix-intermittent-call-log

Bug 938207 - [Dialer] Intermittent Travis Unit Test Failure: dialer/call...
Bug 937251 - [Cost Control] Remove proxy
Bug 947786 - remove 'var navigator = window.navigator'
Bug 948842 - Re-enable test_sms_with_attachments.py