Merge pull request #18580 from etiennesegonzac/bug-997701-tone-player-channel

Bug 997701 - Set TonePlayer's channel when creating the audi element. r=gsvelto, rik
(cherry picked from commit 3617fa6b6e5e2e3c7a198227d27a12bca830ff0a)
Bug 1000277 - [e.me] [Tarako] New API key for Tarako [r=me]
Bug 998118 - Dont display crashed background tabs. r=benfrancis
update tarako marketplace; 2014-04-30
Bug 991297: stop camera stream while previewing photos and videos

add a spinner while the camera is starting up
Merge pull request #18829 from EverythingMe/v1.3t

Bug 1000277 - [e.me] [Tarako] New API key for Tarako [r=me]
Merge pull request #18845 from clouserw/mkt-20140430

Bug 1004146 - new Tarako Marketplace, r=timdream
Merge pull request #18841 from davidflanagan/bug991297

Bug 991297: stop camera stream while previewing photos and videos r=justindarc
Revert "update tarako marketplace; 2014-04-30"

This reverts commit 51b728ea24502c7e633a5df17fc5b5511c71a6aa.
Merge branch 'v1.3' into v1.3t
Bug 997701 - fix the test for 1.3t, import tone_player from shared
Merge pull request #18873 from mikehenrty/bug-997701-toneplayer

Bug 997701 - fix the test for 1.3t, import tone_player from shared