rename database to dao
Merge branch 'master' of git@github.com:apixandru/notbed-db-sql.git