manifest
Merge branch 'master' of https://github.com/takecy/extensions.git
update
Merge remote-tracking branch 'origin/master'

Conflicts:
	social_counter/js/background.js
	social_counter/js/background.ts