DB-Scheme to MASTER

Merge master and db-scheme