Merge branch 'spaces'
add db/schema for setup db
Merge branch 'master' into spaces