modal and bootstrap working
updated modal delete
Merge branch 'master' into authenticate