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

Conflicts:
	includes/noads-common.js
	includes/noads-options.js
	includes/noads-translation.js
	scripts/noads-importer.js