测试 sorl-thumbnail, 设定THUMBNAIL_DEBUG = True
Merge remote-tracking branch 'origin/master'

Conflicts:
	tushanwan/settings.py