评论
Merge remote-tracking branch 'origin/master'

Conflicts:
	english/settings.py