Fixed issues preventing "master" from deployment because of dao-impl merge. Next step is to smoothly allow ORM layer to function for DAO.