Merge remote-tracking branch 'chris-allan/django_cache' into django_cache

Conflicts:
	components/tools/OmeroWeb/omeroweb/webgateway/views.py