Server side and upstream caching is specified. User items will not be cached upstream.
Updated requirements.txt.
Merge branch 'dev' of https://github.com/craig8196/topicalguide into dev
Merge branch 'django-new-version' into dev
requirements.txt

Conflicts:
	requirements.txt