Added friendlist
Merge branch 'friends'