Bug 974292 - [Email][V1.3&V1.4] Tapping the Done button of mail settings page redirects to a blank page
Bug 952415 - [Rocketbar] Duplicate results should not appear.
Merge pull request #15669 from MBRSL/bug-963445-API

Bug 963445 - [UITest][API] refactor tests using Building Blocks
Merge pull request #16253 from pmclanahan/send-language-to-basket-964342

Bug 964342: Send language setting to basket.
Merge pull request #16226 from qdot/971371-remove-integration-directories

Bug 971371 - Remove all test/integration directories from gaia
Merge pull request #16464 from jrburke/bug974292-email-done-blank

Bug 974292 - [Email][V1.3&V1.4] Tapping the Done button of mail settings page redirects to a blank page r=asuth
Merge pull request #16496 from jimporter/ringtone-pick

Bug 953093 - [Fugu][File upload selector] Choosing the system ringtones will go back to the webpage; r=djf
Merge pull request #16394 from allstarschh/Bug972788

Bug 972788 : launch Browser after reading a NFC tag.
Merge pull request #16434 from timdream/httpd-build-stage

Bug 974246 - Find file in build_stage if it doesn't exist in app directory +shepherd
bug 939809

* added StackManager.snapshot which gets a copy of the array of applications in the stack
* updated CardsView to get the list of and current app from StackManager
* made StackManager ignore the System application explicitly
* minor changes to help with jshint later
* added 'position' getter on stack manager
* added several tests to ensure that the position is current after stack has changed
* moved apps used in cards view test into a variable used to populate running apps as well as the stack
* removed old user ordering code (web os model task manager...) since it's incompatible with our new model
  and the code does not have any tests and it hasn't been enabled in a long time. We're moving on!
* detect cardsview being dismissed and re-enable edge gestures
* created a local help function to enable/disable edge gestures based on events received
* select currently active application card in cards view when cards view is shown
  if no active application, then default to stack position.
* cards view uses 'position' in stack internally, updated code to stop using old 'origin' name to avoid confusion.
* cards view now broadcasts 'newStackPosition' when it's closed and the stack position has changed. newStackPosition contains the position of the application that will be in the top of the stack.
* made edge swipe detector listen to 'cardviewclosed' with new fancy newStackPosition, this also prevents edge gestures from being re-enabled when we go back to the homescreen.
* made stack manager use newStackPosition to move application that was displayed from cards view to top of stack.
* fixed cards view unit tests
* prevent system app from appearing in the application history stack.
* updated 'runningApps' var name to 'stack' in cards view for clarity
* updated 'displayedApp' var name to 'currentPosition' in cards view for clarity
* added getter/setter for position in stack manager, with tests
* added getter/setter for lifecycleEnabled in edge gestures as well as tests for it's usage
* added test to stack manager to ensure that system app does not show up in stack
* alignCurrentCard after we remove one.
* fix gaia ui test.
* use 'position' getter/setter everywhere in StackManager.
* added test to ensure that internal _current position in StackManager doesn't accidentily become a string.

r=etienne
Merge pull request #16330 from KevinGrandon/bug_952415_search_deduplication

Bug 952415 - [Rocketbar] Duplicate results should not appear
Merge pull request #16251 from Moz-TedC/master

Bug 965346 - Part 2: Update airplane mode status whenever _enabled flag ...
Bug 971625 - [settings] refactor marionette test for support panel
Bug 963010 - [NFC] When shrinking UI showed up, it will be strange when clicked on home button
Merge pull request #16431 from gasolin/issue-935342

Bug 935342 - [Permission] video&Mic icon for prompt window, r=alive
Merge pull request #16478 from vijayanandh/commsfix

Bug 971648: Add warning message if there is no manifest.webapp r=@yurenju
Revert "Bug 971648: Add warning message if there is no"

This reverts commit 70f3a23da3a89e00afda4eb3573de656b10d8ea0.
Revert "Bug 971648: Add warning message if there is no manifest.webapp"

This reverts commit 3c7e468f78843992a892ff036f470ceb260c6a07.
Bug 974376 - Marionnette JS tests are reported twice on Travis and locally.
Merge pull request #16239 from svic/Bug_972188

Bug 972188 - Don't call pair() for incoming file transfers, r=evelyn