small changes in DAO
Merge branch 'master' of https://github.com/xottabut/InternetProviderWind
resolved conflict