Fix
manifest update
Merge branch 'develop'

Conflicts:
	hook/extension/js/Content.js
	hook/extension/manifest.json
	hook/extension/pages/about.html