Add Dashboard
Add user admin
Merge branch 'admin'