fix unit test after converting MozId to webidl
Fix unit test after converting MozId to webidl r=6a68
Bug 1069184 - [ftu] unittest navigation_test.js incorrect using assert.include for testing existing object property
Bug 1070905 - (way) Better Cards View performance
Bug 1069808 - Make the LazyLoader.getJSON() helper invoke reject() in case of errors instead of resolving the promise to null
Bug 1050558 - Bosnian Word suggestion.
Bug 1061440 - Provide an option for restoring only apn items instead of the entire apn settings

Conflicts:
	apps/settings/js/modules/apn/apn_settings_manager.js
Bug 836690 - Follow up: Add localization comment for sms segments information string. r=flodolo
Bug 1068619 - [v2.2] [v2.1] Investigate test_browser_search failure
Bug 1058793 - [RTL] New System Update notification need RTL support
Bug 1070895 - Pressing ENTER in search box clears search and returns back to inbox
Bug 1038984 - [L10n][Gallery] Clean up mozL10n.get uses in Gallery app r=gandalf, pdahiya, dflanagan
Bug 1057977 - [Status Bar] Remove AM/PM indicator
Bug 1061215 - [Messages][Refactoring] Improve handling of remaining chars counter. r=julien
Bug 1062829 - Converted Json methods from XHR to LazyLoader in the FTU APP
Bug 1069885 - [System][Video][Ringtone]Video app shows Share with ringtone application
Merge pull request #24321 from jrburke/bug1070895-email-search-enter

Bug 1070895 - Pressing ENTER in search box clears search and returns back to inbox r=asuth
Merge pull request #23726 from azasypkin/bug-1061215-remaining-chars-counter

Bug 1061215 - [Messages][Refactoring] Improve handling of remaining chars counter. r=julien
#1065753 Remove sb-icon-notification from statusbar stylesheet R=gauravmittal1995
Bug 1071884 - Prevent doRenderIcon from logging errors r=kgrandon
Bug 1071943 - Disable intermittent failing test, TEST-UNEXPECTED-FAIL | /builds/slave/test/gaia/apps/communications/contacts/test/marionette/ice_test.js | Contacts > ICE contacts ICE contacts Select ICE contact from search, go back to ICE settings