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