some unit test
webpage activator
Merge branch 'dev'

Conflicts:
	activators.js
	background.js