Add support for JPM.
Remove ID and add engines to be compatible with jpm.
Bug 983277 - Intermittent test-ui-sidebar.testSidebarLeakCheckUnloadAfterAttach

Opening a new window for this test to be more certain previous tests do not affect it.
Docstrings

Method comments should be docstrings
Docstrings
Docstrings
Docstrings
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 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
Bug 1020458 - Jetpack should handle timeouts/hangs correctly - outputting a TBPL parsable failure message with test name
Merge pull request #1506 from erikvold/1020458

Bug 1020458 - Jetpack should handle timeouts/hangs correctly r=@jsantell
Bug 1020463 use "Jetpack startup" instead on "unknown" in TBPL output when the test suite fails to start
Merge pull request #1508 from erikvold/1020463

Bug 1020463 use "Jetpack startup" instead on "unknown" in TBPL output when the test suite fails to start r=@jsantell