manifest changed. not sure about what happened to background.js
Merge remote-tracking branch 'origin'