注册验证
Merge remote-tracking branch 'origin/master'

Conflicts:
	english/static/js/index.js
	english/templates/common/base.html
	english/templates/index.html
	english/util/crawler/BusinessEssayParse.py