database started
dir creation works
rare conflict
Merge branch 'f/database' into develop

last merge