Bug-1050129 [Gallery] Single file delete delay fix
Bug 1065520 - [Calendar][Week View] Events still display in Week view after they are deleted from another View
Bug 1072913 - Disable test_play_3gp_video until Bug 1050667 is fixed
Bug 1073356 - [Calendar] Wobbly Refresh Icon Animation
Bug 1061503 - Comments field in contact edit form needs to have the text at the top, and be converted to a textarea
Bug 1037354 - Remove the obsolete references to the TelephonyCall.number and TelephonyCall.secondNumber fields. r=etienne
Bug 1072805 - The [Cancel] button was misaligned in the IME menu.
Bug 1075750 - Remove reference to a dead pref. r=fabrice
Bug 1026384 - [MMS]Display switching of SMS/MMS composition screen
Bug 1070731 - [sms] unit test refactoring for new version chai.assert api
Bug 1076169 - [Camera] fix camera tests with a newer mocha (again) r=wilsonpage
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.
Bug 1076231 - Fix racy unit tests in GaiaSimPicker. r=Rik
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 1061398 - Incall keypad layout needs adjustment
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 1074800 - NfcHandler starts to listen for peerready only when NFC is enabled, r=alive