Database changes
Merge branch 'develop' of https://github.com/eHealthLab/CBB into develop