adding database schema
Merge branch 'master' into basic