Machine and loan DAO (findByParams functions finally works)
merge