Norb
Merge branch 'master' of github.com:MurLemur/ErExt into develop

Conflicts:
	common/content.core.js
	common/options.html
	common/tools.js
Remove console log
Merge pull request #5 from igorez/develop

Norb: