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 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 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 921390 - Display operator name for each SIM on the lockscreen of DSDS devices
Bug 948304 - [Cost control] Remove reference to mindgap.js library
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
Merge pull request #14301 from crh0716/921390

Bug 921390 - Display operator name for each SIM on the lockscreen of DSDS devices r=alive
Bug 907013 - Implement AppWindowManager.

* Disable 3 marionette js tests because marionette seems having trouble on finding out alerts. Will file follow up bugs to re-enable them.
* Remove WindowManager and introduce AppWindowManager
* Introduce LayoutManager who knows and gethers the sizing info well.
* Fix OrientationManager issues.
* Abandon TransitionMixin and "Re"write an AppTransitionController for the use case of edge gesture -- let appWindow support multiple transitions.
* Abandon AuthenticationDialog and "Re"implement AppAuthenticationDialog
* AppWindow: Introduce subcomponents under appWindow
* AppWindow: Introduce broadcast for internal events, publish for external events.
* AppWindow: Introduce event handling mechanism by registeredEvents.
* Fix VisibilityManager issues.
* Change the mechanism in python based gaia-apps.
* More shared code between AppWindow and HomescreenWindow.
* More shared code between AppWindow and ActivityWindow.
* Add 100+ unit test functions.
* Isolate window.css from system.css
* Add a new event in KeyboardManager for continuos transition control.
* Add a developer settings for enabling simultaneous animation control.
* Add jsdoc support.
  http://alivedise.github.io/gaia-system-jsdoc/
Merge pull request #13797 from alivedise/bugzilla/907013_master_rebasing/app_window_manager_v3

Bug 907013 Implement AppWindowManager and bye bye WindowManager, r=etienne
Bug 945464 - [music] add will-animate to music app