Bug 844180: Share content script and page zones.
Bug 860069: Missing semicolons in add-on SDK's promise.js. r=Mossop
Merge pull request #942 from ochameau/contentScriptZone

Bug 844180: Share content script and page zones. r=@mossop
Backout bug 812417 "Pull request #944 from ochameau/bug812417"

This reverts commit b7111ece7367bea97d1582b935cd6bca2101fc85, reversing
changes made to 8ba3879d832ecb554e27147e77bd4060b5bb70b8.
Bug 812417: Listen for domwindowclosed instead of unload when closing a toplevel window.
Merge pull request #948 from ochameau/bug812417-2

Bug 812417: Listen for domwindowclosed instead of unload when closing a toplevel window. r=@mossop
Bug 816257: allowing non-private panel windows in private browsing windows now..