Bug 926727 Detraitify worker
Bug 951950 Fix tests that don't run on Fennec, fix event/core iterating over invalid properties (localStorage) for Fennec's tab which accepts a window
Merge pull request #1340 from jsantell/fix-fennec-tests

Fix Bug 951950 Fix tests that don't run on Fennec, r=@erikvodl
Merge pull request #1265 from jsantell/detraitify-worker

Fix Bug 926727 Detraitify worker, r=@erikvold
Bug 959142 - Jetpack permanent orange on holly because of reliance on CustomizableUI.jsm import

- Added check for `CustomizableUI` in the UI modules
Fix global 'addon' on trusted content by adding back contentURL to workers, broke from worker detraitification
Merge pull request #1346 from jsantell/959433-fix-worker-addon-global

Fix Bug 959433 Fix global 'addon' on trusted content, r=@erikvold
Merge pull request #1344 from ZER0/holly/959142

Bug 959142 - Jetpack permanent orange on holly because of reliance on CustomizableUI.jsm import r=@erikvold
Merge branch 'master' of github.com:mozilla/addon-sdk into 958908

Conflicts:
	lib/sdk/content/worker.js
	lib/sdk/deprecated/symbiont.js