New db schema
Merge branch 'hotfix/new_db_schema'
Merge branch 'hotfix/new_db_schema' into develop
Merge branch 'develop'