add friends list
merge frontend
merge front-end
merge conflict
fixed integration