small fix
Merge branch 'master' of https://github.com/MurLemur/ErExt

Conflicts:
	common/content.main.js