Merge branch 'master' of https://github.com/madhoe/elegant-tab

Conflicts:
	js/options.js
	src/override/override.html
Merge branch 'master' of https://github.com/madhoe/elegant-tab

Conflicts:
	js/options.js
	src/override/override.html