Add dashboard
Add user admin
Merge branch admin