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 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 1007281 - [Homescreen] bookmarking sites will place icon on its own row with a horizontal Row separating it r=crdlc
Bug 1002293 - Travis CI Fixes
Merge pull request #19043 from KevinGrandon/bug_1007352_bookmark_into_last_group

Bug 1007281 - [Homescreen] bookmarking sites will place icon on its own row with a horizontal Row separating it
Merge pull request #19048 from KevinGrandon/bug_1002293_remove_travis_sudo

Bug 1002293 - Travis CI Fixes
bug 983573 - [Gaia] Refactoring webapp-manifest.js
Bug 1001883 - [costcontrol remove unused localizations strings from Firefox OS 2.0
Merge pull request #18317 from cctuan/983573-new

bug 983573 - [Gaia] Refactoring webapp-manifest.js
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