Working on dao manager.
Worked on DaoManager
Merge branch 'develop'