fix rule list bug
Merge remote-tracking branch 'origin/master'

Conflicts:
	HaohanITPlayer/public/DVRMVPlayer.h
Merge branch 'master' of https://github.com/senophen/HH
connect transfor server