Refactored dao

Updated tests
Merge branch 'master' of github.com:markthor/RentIt