Merge branch 'master' into gup
enhance flipflop API
remove toolbar in cms carto plugin
enhance API and permissions
Merge branch 'master' into gup

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

Conflicts:
	dataserver/settings.py
	requirements.txt
handle permissions for bucket
permissions for flipflop and bucket
add missing migration
Merge branch 'gup'
cms fixes + merged gup