add dashboard
add users
Merge branch 'admin'