Bug 1054570 - Cursor is set to the beginning of the password field after it has been shown as plain text
Bug 1074417 - [Search] Search translanted app names for query r=daleharvey
Bug 1072805 - The [Cancel] button was misaligned in the IME menu.
Bug 1027707 - Replace the existing module loading facilities in calendar r=millermedeiros
Merge pull request #24529 from KevinGrandon/bug_1074417_search_localized_apps

Bug 1074417 - [Search] Search translanted app names for query
Revert "Bug 1071445 - [Settings]Cap letter for titles on panels based on new Building Blocks"

This reverts commit cf14b8146c168e2a7d31cdb178d9ab720e64466f.
Merge pull request #23775 from gaye/calendar-amd

Bug 1027707 - Replace the existing module loading facilities in calendar r=millermedeiros
Merge pull request #24478 from lodr/bug-1054570-user-can-not-set-cursor-when-user-select-none

Bug 1054570 - Cursor is set to the beginning of the password field after it has been shown as plain text
r=borjasalguero
Revert "Bug 967516 - Enable DEVICE_DEBUG by default for non production builds r=ochameau"

This reverts commit 2cf552888bf0f2bfe8a6c7939f2cef5e57dbfcf1.
Revert "Bug 107272 - Truncated STK with soft-button"

This reverts commit 5837b4acd4a0d4639e8ff0abcbec60822d89edf0.

Please see bug 1072728. Reverting due to incorrect bug number.
Revert "Bug 1071988 - Include date_time_helper.js"

This reverts commit e86143f5a64f68bc182be48836d7ff0e397e8b3f.
Revert "Bug 1027707 - Replace the existing module loading facilities in calendar r=millermedeiros"

This reverts commit abf72f5e6259e4c2c5c744b603931f89ef4512c4.
Bug 1076454 - Disable intermittent failing test, TEST-UNEXPECTED-FAIL | /builds/slave/test/gaia/apps/system/test/marionette/browser_chrome_share_web_result_test.js | Browser Chrome - Share Web Result share web result via e-mail r=kgrandon
Bug 1055299: Ignore continuous app launch request in homescreen side and send homescreen to background while rocketbar is open in system side

Conflicts:
	shared/elements/gaia_grid/js/grid_view.js
Bug 1072728 -  Truncated STK with soft-button r=frsela
Bug 1076716 - Disable intermittent failing test, TEST-UNEXPECTED-FAIL | /builds/slave/test/gaia/apps/calendar/test/marionette/day_view_test.js | day view "before each" hook r=kgrandon
Merge pull request #24562 from RudyLu/ime/Bug1072805_ime_button_misAligned

Bug 1072805 - The [Cancel] button was misaligned in the IME menu.
r=alive, yzen.
Merge pull request #24649 from alivedise/bugzilla/1055299_master/v6

Bug 1055299: Ignore continuous app launch request in homescreen side and...r=kgrandon
Bug 1074033 - Edge gestures overlapping
Bug 1075105 - Not showing ambient indicator in LockScreen