Update background.js
Merge branch 'master' into double-click-take-two

Conflicts:
	src/background.js