modified addqiaolin
Merge branch 'master' of https://github.com/it-yang/text_git

Conflicts:
	yang/django - templates.txt
Merge branch 'master' of https://github.com/it-yang/text_git

Conflicts:
	yang/django - templates.txt