Config fix
Merge branch 'develop' of github.com:antler/caribou-admin into develop
config rearrangement
Fixing some underscore slugs
resolved conflicts in core