DAOs_development

merge with credr master branch