Added friend and message notification
Notification merged