Dao in UserPresenter
Merge origin/master