Bug 1001856 - [settings] remove unused localization strings from Firefox OS 2.0
Bug 1003993 - FxA System app - remove refs to 'accountId', replace with 'email'. r=ferjm
Bug 1004099 - FxA Settings app - remove refs to 'accountId', replace with 'email'. r=arthurcc
Bug 971443 - [System2] Instantiable Accessibility r=alive
Bug 997601 - Save the caller id preferece across reboots
Bug 1000132 - [Building Blocks] Split headers.css to demo @import
Bug 999506 - Detect the device_root before pushing/clearing files from the device, remove hardcoded references to /sdcard
Bug 1004438 - [NFC] NDEF TNF Absolute URI should be handled properly in NfcManager
Bug 1005797 - NFC: There should be an icon for NFC on the status bar
Bug 1001883 - [costcontrol remove unused localizations strings from Firefox OS 2.0
Bug 1002339 - [Stingray] layout editor for stingray
Bug 1005918 - [FTU-Separation] Move import tests to contacts/test/unit/import
Merge branch 'master' into settings-stringRemoval
Bug 1006469 - Fix test_cards_view_with_two_apps.py, flicks in wrong direction
Bug 1007561 - Using local http server to test distribution mechanism
Merge pull request #18408 from crh0716/997601

Bug 997601 - Save the caller id preferece across reboots r=jaoo
Bug 1001901 - [ftu] remove unused localization strings from Firefox OS 2.0
Merge pull request #19052 from Archaeopteryx/costcontrol-stringRemoval

Bug 1001883 - [costcontrol remove unused localizations strings from Firefox OS 2.0. r=salva
Bug 1003774 - [FTU-Separation] Move local oauth redirect files
Merge pull request #18946 from jmcanterafonseca/move_import_tests2

Bug 1005918 - [FTU-Separation] Move import tests to contacts/test/unit/i...