work in progress
Merge branch 'master' of https://github.com/danjee/generic-dao.git