merge friendlist

some notification improvements