update in dao
list and equals
Merge branch 'master' of git@github.com:alexandrubledea/notbed-db.git into java_1.6