Add dashboard
Add user html
Merge branch 'admin'