Changes
Merge branch 'master' of github.com:mmclinn-carecloud/cc-dataslice

Conflicts:
	jailer/.cdsettings