added db schema
handling errors properly
Merge remote-tracking branch 'origin/master' into deploy