added admin-dashboard
bug fix on master
merge conflict