merge friendlist and notification system improvements