upgrade djcms
Merge branch 'gup' of https://github.com/UnissonCo/dataserver into gup

Conflicts:
	dataserver/settings.py
	requirements.txt