some dao files
more files
mergeando
file fixes
asd
rebase done
Merge branch 'green-dao-impl' of github.com:SKOLZ/the-cheese-guardian into green-dao-impl