admin edit and delete functions complete
Merge branch 'features'