fix setting pic show
Merge remote-tracking branch 'tennis/master'

Conflicts:
	logs/django_request.log