修改过滤规则
Merge branch 'master' of https://github.com/hurricane1260/zhihui

Conflicts:
	zhihui/tools/trainDataMaker.py