fix merge error
Merge branch 'master' of https://github.com/chinalist/chinalist

Conflicts:
	adblock-lazy.txt
	dev/patch.xml