refactor db; disabled testing data
Merge branch 'feature/sql_refactor' into develop