sorl thumbnail
updated reqs
Merge branch 'refs/heads/feature-models-images' into feature-models
Merge branch 'refs/heads/feature-models'

Conflicts:
	requirements.txt