Add dashboard
Add duser admin
Merge branch 'admin'