update
Merge remote-tracking branch 'origin/master'

Conflicts:
	social_counter/js/background.ts