Merge pull request #1 from sosandstrom/master

Update fork
Move query page from generated code to AbstractDao
Merge branch 'master' of https://github.com/sosandstrom/mardao
Merge pull request #33 from mattiaslevin/master

Move query page from generated code to AbstractDao