adds dashboard
adds users
Merge branch 'admin'