Merge branch 'master' of git://github.com/Dither/noads-advanced

Conflicts:
	includes/noads-options.js
	includes/noads-service.js
	includes/noads.js
	index.html
	scripts/noads-background.js