Merge branch 'hotfix/0.0.1'
moved buggy db code out of the way
Merge branch 'hotfix/app-crash-1' into develop