Correcting notifications, adding link field to notification entity; Still working with front-end;
Merge