some dao files
more files
mergeando
file fixes
asd
rebase done