Moved db stuff to DbModel
merge fix with database move
Merge branch 'Matias' into Harald