Bug 856999: Add --no-quit option to prevent from killing firefox when running tests.
Merge branch 'master' of https://github.com/mozilla/addon-sdk into bug856999

Conflicts:
	app-extension/bootstrap.js
	lib/sdk/system.js
	python-lib/cuddlefish/__init__.py
Bug 856999: fix for using --no-quit and --stop-on-error together, which was quiting before
Merge pull request #1620 from erikvold/856999

Bug 856999: Add --no-quit option to prevent from killing firefox when running tests r=@jsantell