Merge remote-tracking branch 'upstream/Dev'

Conflicts:
	js/background.js
	onSerer/rulelist/configlist
	onSerer/README.md
	onSerer/gen.py
	onSerer/oconfiglist.py