Add dashboard
Add user admin
Complete merge