Add support for JPM.
Remove ID and add engines to be compatible with jpm.
bug 1012443 - remove unneeded import from cfx
Merge pull request #1494 from kud/patch-1

bug 1012443 - remove unneeded import from cfx, r=@zombie
Bug 1003095 - Convert DevToolsExtensions.jsm into an SDK module;r=past;r=ZER0
bug 1009938 - gBrowser null in SeaMonkey
Merge pull request #1495 from zombie/1009938-gBrowser-null

bug 1009938 - getTabBrowser() null in SeaMonkey, r=@ZER0
bug 1015763 - e10s getTabForContentWindow throws
Bug 1016332 - Remove BOM in .js files
bug 1005488 - deprecate content/content
Merge pull request #1499 from poiru/remove-bom

Bug 1016332 - Remove BOM in .js files r=erikvold
Merge pull request #1500 from zombie/1005488-deprecate-content

bug 1005488 - deprecate content/content, r=@jsantell
Bug 979675 - Disable child-process tests until they can be fixed r=kwierso
bug 1005488 - deprecate content/content

our tests never clean prefs after themselves
Add anon parameter to Request API

Add a anon parameter to Request API to prevent exposing user credentials
and sending cookies.
Add getter/setter for anon property and unit test
Add anonymous request functional tests
Add anonymous property to Respons class
Merge pull request #1477 from PerfectSlayer/anon-request

Bug 1002229 - Add anon parameter to Request API, r=@zombie
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