Fix availability DAO
Merge branch 'master' of github.com:enwida/idpRepo