Added friending
Clean friending
Merging master