Changed signature of daos to return entities instead of dtos.
Merge commit