Bug 937536 - [e.me] Custom Collection is generated without an icon [r=ranbena, evyatron]
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 944068] Revise collection style [r=amirn]
Bug 935860 Remove the "sendString" method from Korean IME
Bug 925398 - Refactor runtests.py to follow Mixin pattern
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 942751 - stop OscillatorNodes when done to work around bug 897796

This patch also reverts to the behavior of the prior mozWriteAudio
implementation where stop() only stops long presses, allowing short presses to
release appropriately.
Bug 933203 - [DSDS] Operator variant logic: APN settings
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 938207 - [Dialer] Intermittent Travis Unit Test Failure: dialer/call_log_db Two calls, same group, different hour Add a call: Error: timeout of 2000ms exceeded r=etienne

* increase the timeout for the call_log_db tests because we're using an
  asynchronous IndexedDB API and we really want to use it even in the tests
* rename calllog_db_test to call_log_db_test so that the tests will be run when
  saving call_log_db.js
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 945464 - [music] add will-animate to music app
Bug 948799 - Xfail test_cost_control_reset_wifi.py
Bug 948811 - Remove HTML in comments
Merge pull request #14532 from julienw/fix-intermittent-call-log

Bug 938207 - [Dialer] Intermittent Travis Unit Test Failure: dialer/call...
Bug 948842 - Re-enable test_sms_with_attachments.py
Merge pull request #14550 from dominickuo/bug-945464

Bug 945464 - [music] add will-animate to music app, r=dominickuo
Merge pull request #14529 from jaoo/933203

Bug 933203 - [DSDS] Operator variant logic: APN settings. r=kaze