Bug 946744 - [Messages] Long invalid recipients makes the recipient panel horizontally scrollable r=borja

Uses box-sizing: border-box to have something consistent between recipient
states
Bug 946176 - [e.me][Bug] Collections Tapping issues [r=evyatar]
Bug 946678 - [Messaging] Creating a new message from contacts does not open the messaging composer when Messaging app is in background r=borja

Adds a hash for the "new" activity. This will have the side-effect of not
registering the notification and sms-received system message handlers which is a
good thing.
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 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 948385 - Merge test_set_alarm_repeat, test_set_alarm_snooze, test_set_alarm_sound.py
Bug 948852 - Fix the event creation error
Bug 948346 - MMS when message has multiple lines, it cuts off
Bug 948822 - Fix xfail message for test_cards_view_with_two_apps.py
Bug 948177 - Setup Travis S3 bucket / artifact configuration
Bug 938219 - [Contacts] Unable to select a contact via the contact update activity
Bug 948299 - [BuildScript] Use PROFILE_DIR instead of PROFILE_FOLDER in the extension handling module
Merge pull request #14554 from alivedise/bugzilla/948811_master/jsdoc-refine

Bug 948811 - Remove HTML in comments, r=arthur
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