Added layer between model and database.
Merge remote-tracking branch 'origin/dev' into dev-layersql
Merged database layer with dev-model.