Database init
Merge branch 'suzic' into develop