Bug 946176 - [e.me][Bug] Collections Tapping issues [r=evyatar]
Bug 947918: Support seeking to end of BlobView buffer

Reading or advancing through all bytes in a BlobView buffer sets
the index to the length of the buffer. This patch changes 'seek'
to work the same way, so it's possible to seek to the buffer's
end.

Signed-off-by: Thomas Zimmermann <tdz@users.sourceforge.net>
Bug 944881 - Gaia should interpret timestamps as long-long numbers
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 937251 - [Cost Control] Remove proxy
Bug 924843 - Icons on grid do not re-arrange automatically when dragging over collections
Bug 948385 - Merge test_set_alarm_repeat, test_set_alarm_snooze, test_set_alarm_sound.py
Bug 948346 - MMS when message has multiple lines, it cuts off
Bug 946807 - Dont postResult to activity with no return value
Bug 948769 - [Settings][DSDS] Default service ID should be a number

- make all settings from String to Number
Utilize Date.now() and other fixing.
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...
Bug 949351 - [Download Manager] Remove workaround to avoid bug 944682
Merge pull request #14224 from flodolo/separate_header

Bug 944749 - [Settings][l12y] Use different labels for menu items and headers, r=kaze
Bug 949364 - Unxfail test_add_photo_to_contact.py
Merge pull request #14405 from EverythingMe/946176-collection-tap

Bug 946176 - [e.me][Bug] Collections Tapping issues [r=evyatar]
Bug 947432 - [DSDS] Marketplace and Payment indication in Settings

- update strings