Bug 946666 - Write a test for wakelock
Bug 942220 - Add explicit wait in tap_back in contact_details.py
Bug 948440 - is_gps_enabled checkbox logic is outdated
Bug 930600 - Add new Illustrative Wallpapers for v.1.3
Merge pull request #14543 from pivanov/bug-930600

Bug 930600 - Add new Illustrative Wallpapers for v.1.3
Merge pull request #14541 from viorelaioia/bug_948440

Bug 948440 - is_gps_enabled checkbox logic is outdated
Use non-native marionette-js-runner for buildbot
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