Bug 958908 - Remove usage of deprecated/observer-service
Merge branch 'master' of github.com:mozilla/addon-sdk into 958908

Conflicts:
	lib/sdk/content/worker.js
	lib/sdk/deprecated/symbiont.js
Merge pull request #1343 from erikvold/958908

Bug 958908 - Remove usage of deprecated/observer-service r=@jsantell