Bug 970340 - [Download Manager]A file with a size >1GB is not displayed successfully
Bug 972188 - Don't call pair() for incoming file transfers
Bug 965346 - Part 2: Update airplane mode status whenever _enabled flag is changed. r=alive
Bug 964342: Send language setting to basket.

* Add error codes to basket client.
* Use error code for invalid email instead of looking for a message.
* Add timeout handling for call to basket.
Bug 963445 - [UITest][API] refactor tests using Building Blocks
Bug 972701 - [Camera] Stop Icon overlaps with Camera Shutter icon while recording video

Conflicts:
	apps/camera/style/controls.css
Bug 972788 : launch Browser after reading a NFC tag.
Bug 972277 - Making sure the statusbar is on the lockscreen when the active app is fullscreen.
r=timdream
Bug 964517 - Add solid background to apps where appropriate. r=alive
Bug 935342 - [Permission] video&Mic icon for prompt window
Bug 974246 - Find file in build_stage if it doesn't exist in app directory
Bug 974283 - Fix intermittent failure of test_music_album_mp3.py
Bug 973593 - Address failure in test_cost_control_data_alert_mobile.py
Bug 940496 - Write a test to open a window from inside an iframe

Added new page object for the window open menu and the pop-up page.
Bug 974361 - Memory average assumes the array of measurements always exists
Bug 962795 - Re-enable python e.me tests
Bug 974048 - Refine waits when connecting to a WiFi network
Bug 947617 - fixed clock hand transform to invoke the GPU
Bug 965912 - Time-zone and City change not visible in the FTU menu
Bug 971648: Add warning message if there is no manifest.webapp
or update.webapp file in app directory; r= reviews