Bug 944881 - Gaia should interpret timestamps as long-long numbers
Bug 948440 - is_gps_enabled checkbox logic is outdated
Bug 944749 - [Settings][l12y] Use different labels for menu items and headers

Don't reuse labels in different contexts (and with different space available).
Use fallback to original string for headers ({{id}}) to reduce impact on existing localizations.
One more minor fix
Bug 938207 - [Dialer] Intermittent Travis Unit Test Failure: dialer/call_log_db Two calls, same group, different hour Add a call: Error: timeout of 2000ms exceeded r=etienne

* increase the timeout for the call_log_db tests because we're using an
  asynchronous IndexedDB API and we really want to use it even in the tests
* rename calllog_db_test to call_log_db_test so that the tests will be run when
  saving call_log_db.js
Bug 948468 - xfail test_dialer_add_contact with bug 947317 r=me
Bug 945774 - Remove xfail from test_sms_with_attachments r=me
Merge pull request #14458 from tdz/bug-916850

Bug 916850: Skip multi-page Ogg meta data r=padenot
Merge pull request #14290 from changm/bug945461

bug 945461. Keep scrolling portion of email app message list and message...
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
Merge pull request #14518 from autonome/816133

Bug 816133 - Brightness default value should not be automatic