add dashboard
add user admin
merge branch 'admin'