Add dashboard
Add users
Merge branch 'admin'