delete button working
Merge branch 'master' into ajax_request