Merge branch 'master' into 0.6yangzebranch

Conflicts:
	main/models.py
	main/views.py