delete button implemented
delete btn
foreign key
Merge branch 'yesteryear' into server2
order of notifications fixed