Bug 981566 - [settings] add marionette test for device information - Your Privacy
Bug 1064593 - Pass the activity name used in the loop client app as a string in order to make it easier to automatically extract the activity name from the source code; r=ferjm
Bug 1059683 - Report one less pixel from KeyboardManager for ceiling due to dpx
Bug 1061135 - Re-enable the tests
Bug 1062820 - Home screen and status bar behave different after clicking home button among versions
Bug 1065323 - 'Add' button is not localizable in FDN - Authorized Numbers
Bug 1063601 - Don't show indicator with tray open
Bug 1014052 - making statusbar markup consistent with layout for better screen reader usability. r=mhenretty
Bug 1043408 - Use marionette-apps version 0.3.9
Merge pull request #23511 from yzen/bug-1014052

Bug 1014052 - making statusbar markup consistent with layout for better ...
Bug 1065658 - [Rocketbar] Do not hide search window if app launches in background r=alive
Merge pull request #23827 from ehsan/1064593

Bug 1064593 - Pass the activity name used in the loop client app as a string in order to make it easier to automatically extract the activity name from the source code. r=francisco
Merge pull request #23917 from KevinGrandon/bug_1065658_search_app_closes_background

Bug 1065658 - [Rocketbar] Do not hide search window if app launches in background
Bug 1053703 - Merge pre-app.js, app.js and post-app.js to one javascript file r=gduan

Conflicts:
	Makefile
Merge pull request #22248 from mancas/bug981566

Bug 981566 - [settings] add marionette test for device information - You... r=gduan
Merge pull request #23845 from crdlc/bug-1062820

Bug 1062820 - Home screen and status bar behave different after clicking...
Merge pull request #23892 from evanxd/bug-1061135

Bug 1061135 - Re-enable the tests r=me
Merge pull request #23934 from evanxd/bug-1043408

Bug 1043408 - Use marionette-apps version 0.3.9 r=me
Bug 1065886 - fix jsdoc build errors
Merge pull request #23940 from gasolin/issue-1065886

Bug 1065886 - fix jsdoc build errors, r=me