Add support for JPM.
Remove ID and add engines to be compatible with jpm.
Docstrings

Method comments should be docstrings
Docstrings
Docstrings
Docstrings
bug 1015763 - e10s getTabForContentWindow throws
bug 1005488 - deprecate content/content

our tests never clean prefs after themselves
Bug 1011813 - make test addon for native options unload
Introduce cfx.js and use it to build the xpi before launching firefox/adb.

taken from a1f0782b96ed6ebdbc9e3923305db85512280c6f
removing console.logs
Bug 1011813 - making sdk/zip/utils return promises
Revert changes to sdk/tab/utils and sdk/addon/installer

This reverts commit 5724de6d65fbf6b7352ccae9aea902a5f3067450.

Conflicts:
	lib/sdk/preferences/utils.js
	test/test-simple-prefs.js
Bug 1011813 fixing test after sdk/addon/installer revert
Merge pull request #1503 from zombie/1005488-deprecate-content

bug 1005488 - deprecate content/content, set test pref, r=@jsantell
Merge pull request #1498 from zombie/1015763-getTabForContentWindow

bug 1015763 - getTabForContentWindow throws with e10s, r=@ZER0
Bug 1015396 - Get rid of apiSandbox. r=irakli

Currently, Jetpack uses two sandboxes for each content script - one for the
content script itself, and another for SDK machinery. And we end up getting Xrays
between the sandboxes, even though they're same-origin (generally with an nsEP)
because Jetpack sandboxes use |wantXrays: true| to get same-origin Xrays.

Object Xrays cause all sorts of communication problems between the sandboxes.
Irakli says we don't actually need the separate sandbox anymore since we've
removed the proxy layer, so let's just get rid of it.
Merge branch 'master' of git://github.com/mozilla/addon-sdk into 1020667

Conflicts:
	lib/sdk/addon/runner.js
	lib/toolkit/loader.js
Bug 1020667 fixing  busted testcfx and testaddons tests
Merge pull request #1505 from erikvold/1020667

Bug 1020667 Add support for JPM r=me a=gozala