Updated doa
updated dao
changed university to appuser
Merge branch 'master' into daofuture