HEBING
Merge remote-tracking branch 'origin/master'

Conflicts:
	hanyuqiao/test.pyc
Merge branch 'master' of https://github.com/hungerr/hanyuqiao