Bug 946176 - [e.me][Bug] Collections Tapping issues [r=evyatar]
Bug 944749 - [Settings][l12y] Use different labels for menu items and headers

Don't reuse labels in different contexts (and with different space available).
Use fallback to original string for headers ({{id}}) to reduce impact on existing localizations.
Bug 946047: Add nfc read only permissions to Settings UI to allow navigator.mozNfc DOM to be created.

This fix is needed for apps using NFC if "HasNfcSupport" is added to the navigator MozNfc WebIDL.

Conflicts:
	apps/settings/manifest.webapp
Bug 948811 - Remove HTML in comments
Bug 937251 - [Cost Control] Remove proxy
Bug 924843 - Icons on grid do not re-arrange automatically when dragging over collections
Bug 948862 - [Contacts] The first time exporting a contact to SIM creates a duplicate of the contact in the contact list
Bug 948385 - Merge test_set_alarm_repeat, test_set_alarm_snooze, test_set_alarm_sound.py
Bug 948852 - Fix the event creation error
bump marionette-client and gaiatest versions, enable gaia-ui-tests
Bug 948396 - [Calendar] Can not scroll anymore the week/day view once the new event has been opened with APZ turned on. r=kgrandon
Bug 942854 - [Calendar] Scrolling the week view results into results into overlapping artifacts. r=kgrandon
Bug 948001 - [Settings] With APZ turned on the wifi panel is sometimes shown instead of the main panel at startup. r=arthurchen
Bug 943498: Spread email scroll sync reflows.
Bug 948822 - Fix xfail message for test_cards_view_with_two_apps.py
Merge pull request #14276 from wanderview/email-scroll-jank

Bug 943498: Spread email scroll sync reflows.  r=asuth
Merge pull request #14575 from vingtetun/bug909877

Bug 948001 - [Settings] With APZ turned on the wifi panel is sometimes s...
Merge pull request #14574 from vingtetun/bug942854

Bug 942854 - [Calendar] Scrolling the week view results into results int...
Merge pull request #14571 from malini/version

Bug 947001 - bump marionette-client and gaiatest versions, r=davehunt
Merge pull request #14567 from jmcanterafonseca/fix_export_sim_948862_master

Bug 948862 - [Contacts] The first time exporting a contact to SIM create...