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 924843 - Icons on grid do not re-arrange automatically when dragging over collections
Bug 948299 - [BuildScript] Use PROFILE_DIR instead of PROFILE_FOLDER in the extension handling module
Bug 948769 - [Settings][DSDS] Default service ID should be a number

- make all settings from String to Number
Bug 944009 - [B2G][Keyboard] Keyboard does not always display when tapping on a text field
    -- handle OOM
Bug 948792 - Fix cardview transition
Merge pull request #14528 from snowmantw/issue948299

Bug 948299 - [BuildScript] Use PROFILE_DIR instead of PROFILE_FOLDER in the extension handling module
Merge pull request #14553 from alivedise/bugzilla/948792/cardview-transition

Bug 948792 - Fix cardview transition, r=etienne
Merge pull request #14563 from mpizza/Bug_944009

Bug 944009 - [B2G][Keyboard] Keyboard does not always display when tapping on a text field. r=timdream,
        -- handle OOM
Merge pull request #14564 from EragonJ/bug-948769

Bug 948769 - [Settings][DSDS] Default service ID should be a number
Merge pull request #14368 from svic/rebase-df070d4e-NFC-Settings-permission

Bug 946047: Add nfc read only permissions to Settings UI to allow navigator.mozNfc DOM to be created. r=evelyn
Merge pull request #14565 from crdlc/bug-924843

Bug 924843 - Icons on grid do not re-arrange automatically when dragging...
Merge pull request #14224 from flodolo/separate_header

Bug 944749 - [Settings][l12y] Use different labels for menu items and headers, r=kaze