Add dashboard
Add user admin
fix users
Merge branch 'admin'