cms/local_settings.py:  changes for sdavis Help work
jqueryupload/ and templates: commit for git-pull
Merge branch 'sdavis-styling-changes' of github.com:biggers/practical-django-tng into sdavis-styling-changes
CONFLICTS: cms/local_settings.py
Merge branch 'sdavis-styling-changes' of github.com:biggers/practical-django-tng into sdavis-styling-changes