Add Dashboard
Add Users
Merge branch 'admin'