Bug 837973: Find Aurora binary on Windows
Merge pull request #764 from Benvie/bug837973

Bug 837973: Find Aurora binary on Windows r=@ochameau
Fix for Bug 827548 - SDK API Lifecycle should be updated; r=@ZER0
Bug 836008 - "preferences/service" name is wrong in the doc; r=@ZER0
Merge branch 'master' of https://github.com/mozilla/addon-sdk into 828746
bug 828746: testing require("sdk/private-browsing/window/utils").getOwnerWIndow, and adding isPrivate support for Fennec, though this still always returns false at the moment
Merge branch '828746' of github.com:erikvold/jetpack-sdk into 834961

Conflicts:
	test/test-private-browsing.js