added admin panel
merge
fixed merge
added delete user
fixed break problem
added columns to users