Merge branch 'release/1.0'
Add db to setup
Merge branch 'hotfix/db-setup-fix' into develop