add dashboard
add user
Merge branch 'admin'