Added friend and message notification
Notification merged
revert back notification
resolve conflicts
solve my conflict