added icons
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	canonical-19.png
	canonical-38.png
	content.js
	manifest.json
extension.sendMessage -> runtime.sendMessage