Merge branch 'master' into patch-1

src/uploads/apps.py

src/uploads/templates/uploads/home.html

src/uploads/templates/uploads/model_form_upload.html

src/uploads/templates/uploads/simple_upload.html

src/uploads/templates/uploads/upload.html

src/uploads/urls.py

src/uploads/views.py