广告屏蔽记录更新

去除冗余数据；修复无效数据；合并2mdn.net记录。
Merge branch 'master' of https://github.com/modouwifi/hdns

Conflicts:
	conf/adblock.conf
Merge pull request #3 from 1294822/master

广告屏蔽记录更新