Norb:
Refactored user active items
Merge branch 'master' of github.com:MurLemur/ErExt into develop

Conflicts:
	common/content.common.js
	common/options.html
	common/tools.js
	common/user/background.user-active-items.js
Norb:
Refactored global events.
Merge pull request #11 from igorez/develop

Norb: