add dashboard, add user admin
Merge branch 'admin'